templates working
typo fix
pep8
Merge pull request #2 from lovato/templates

Templates