improved performance
Merge pull request #4 from lunny/master

improved performance