Add user-class option in help text and minor clean up
Merge pull request #19 from dedeckeh/bugfixes

Add user-class option in help text and minor clean up