better signal handling
Merge branch 'master' into salesforce