Merge pull request #235 from ocroquette/sigint