Merge tag '1.0.1' into develop

Release 1.0.1
Fix broken templates
Bump version, Update changelog
Merge branch 'release/1.0.2'