Add --help
Merge branch 'master' into debian