Fix wrong arguments parsing

Some problems happened if you do not passed some arguments first then
others.
Merge branch 'develop'