verison2 of template
Merge pull request #1 from topahl/version1.1

verison2 of template