Merge pull request #125 from SaveTheRbtz/master

Recovery. Improved robustness.
recovery: properly catch SIG_INT