0.6.1, arg fixes and better version detection
pep8
Merge pull request #10 from dougwig/master

0.6.1 - arg fixes