Merge branch 'sg/parse-options-h-users'