- Fix for issue #1

- New template format
- Updated tests