Improve SIGTERM handling. See issue #40
Merge pull request #41 from michaeldiscala/master

Improve SIGTERM handling. See issue #40