Improved performance
Merge pull request #15 from dmgts/master

Improved performance