Consume cmd
consume cmd
fix parsing
Merge pull request #62 from yschaeff/cmdfixes

Cmdfixes