fortytw2 Merge pull request #5 from docmerlin/master

Makes shutdown cleaner, add more args, and fix tests