Add -h option as well as --help
Merge remote-tracking branch 'origin/master'