added sanity check for help (-h)
Merge remote-tracking branch 'origin/master'