merge problem fix
Merge branch 'fatso83-separate-command-line-parsing' into dev