Better arg validation
Merge pull request #1 from hwiechers/argval

Better arg validation