improved performance
Merge pull request #1 from TheJP/master

improved performance