Make -h option equivalent to help command

Fixes #867.