Fixed #2: add --help text
Merge remote-tracking branch 'origin/master'