#8 Templates implementation
Merge branch 'templates'