Better argument handling
Fixing duplicat arg problem
Merge pull request #107 from jproffitt/issue_105

Better argument handling