Use 2 spaces instead of 4
Add build control task

Fixes #30
Merge branch 'feature/deploy' into develop