Smoother handling of arguments error
Merge pull request #9 from miska/master

Smoother handling of arguments error