fixed cmd interface; updated tests
Merge branch 'master' into develop