Merge pull request #9 from python-project-templates/tkp/012

Merge pull request #9 from python-project-templates/tkp/012 #23