templating
Merge pull request #16 from phikhi/master

templating