Implemented better way to include the templates, see #10