Added more CLI argument checks
Merge pull request #158 from keithj/devel

Added more CLI argument checks