command line, ui updated
Merge remote-tracking branch 'origin/0.5' into 0.5
Merge branch '0.5' of https://github.com/indykish/docs into 0.5
Merge pull request #13 from indykish/0.5

0.5