Merge pull request #1 from maurymmarques/master

Merge
Just little optimizations