Optimized the build part 2
Merge pull request #110 from LaurentGoderre/optimize-build

Optimized the build part 2