Merge pull request #38 from python-project-templates/tkp/022

Merge pull request #38 from python-project-templates/tkp/022 #56