more templates
merge
Finished cleanup. 0.1.1 release
Finished cleanup. 0.1.1 release
Merge branch 'develop'