Merge pull request #31 from python-project-templates/tkp/018

Merge pull request #31 from python-project-templates/tkp/018 #45