Improvements & additions

Closed [previous pull request](https://github.com/perungrad/Templatte/pull/1) because of wrong branch.