Merge pull request #1 from maurymmarques/master

Merge
Just little optimizations
Merge pull request #9 from NerOcrO/master

Just little optimizations