Optimized the build
Addresses #12
Merge pull request #16 from wet-boew/optimize-build

Optimized the build