Fix help handling.
Merge pull request #47 from infirit/yelp

Fix help handling.