Optimized the build

Addresses #12