Optimized the build
Merge pull request #206 from LaurentGoderre/optimize-build

Optimized the build