improve build tasks closes #39