Fixing weird templates
Merge branch 'master' into idos