Cleaned up the build script.
Merge branch 'release/0.4'