Micro optimization
Build
Merge pull request #1 from kewah/master

Micro optimizations