remerging sigint handling....
merging sigint handling back from master