More work on Templates
Merge branch 'master'