Merge pull request #3 from DanMcInerney/master

Update dev. fork
Test update to fix signal handling
Merge pull request #51 from ddworken/master

Fixed signal handling