build 0.1.4, bug fixing templates
Merge branch 'develop'