removed terminates outside of -q
semi broken
fixed merge conflicts
Merge pull request #66 from r3dunlop/master

Broken things