bug #1617 initial templates
Merge branch 'master' into bug_1617
bug #1617 templates
Merge pull request #5 from novirael/bug_1617

Bug 1617