Optimized the build
Merge pull request #84 from LaurentGoderre/master

Optimized the build