Improved signal handling
Merge branch 'master' of github.com:Neamar/corporate