Adjustments for new command-interface
Merge pull request #12 from promovicz/c-i-updates

Adjustments for new command-interface