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

Optimized the build