even more optimizations
Merge pull request #4 from m-schrepel/master

yet more!