Error checking and threading

Merge pull request #2 from daviesrob/0.5.10-mt_fixes

Ensure we exit 1 when given an invalid command-line option.

Error checking and threading

Merge pull request #1 from daviesrob/0.5.10-mt_fixes

0.5.10 mt fixes