Use long arg names

Makes the code more self-documenting
Merge pull request #13 from andyw8/use-long-arg-names

Use long arg names