fixed formatting exception with command line option -h
Merge branch 'master' into develop

* master:
  fixed formatting exception with command line option -h