Changed data passed to template (issue #60)
Bugfix template inclusion (closes #60)