Proper Signal Handler, Fixes #4