Merge branch 'hotfix/0.4.1.1'
Fix bug with templates and start_year
Bump version number
Merge branch 'hotfix/0.4.1.2' into develop