Added some more features to console interface
Merge branch 'master' of github.com:thebreadcat/Tradock