Further optimizations :D
Merge pull request #28 from asm/master

I don't know why I didn't see this optimization earlier...