Starting to add support for templating.
Fixing a typo
Adding unit tests for 100% coverage
Version bump 0.2.0