Refactor build tasks
Release 0.4.1