Fix bug
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'Templates'
Fix misprint
Merge branch 'master' into dev