Merge pull request #226 from fpavageau/master

Performance improvements