Merge pull request #28 from GtakillerIV/master

Optimizations