Merge branch 'master' into develop
refs #31
Fix template
Merge branch 'develop'