merging from hana
Merge pull request #21 from ercchy/master

Working on templates