Merge pull request #26 from python-project-templates/tkp/exit

Merge pull request #26 from python-project-templates/tkp/exit #36