fix command args parsing
Merge branch 'fix-args'

* fix-args:
  fix command args parsing