Clean up build process.
Merge branch 'hotfix/0.1.1'