Don't use underscores in cmd line arguments
Merge pull request #579 from dorkster/bugfixes

Don't use underscores in cmd line arguments