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

Optimized the build