Fixes #33
Clean up signal support