Merge pull request #64 from r3dunlop/master

Added a couple of input flags
removed terminates outside of -q
semi broken