Merge pull request #19 from Lithl/master

Clean up help dispatch and no-arg crash