Fix argument parsing.
Merge branch 'hotfix/gwf-arg-parsing' into develop