Refactoring add_template #10
Fix error/pending step number shifts #9
Merge pull request #11 from gongo/refactor2

Refactor2