Make the cli work again.
Merge pull request #70 from okin/master

Make the cli work again.