Simplify build-process
0.5.1