Made the argument parsing a bit more logical
Merge pull request #4 from mueslo/patch-1

Made the argument parsing a bit more logical