Changed CLI message output format
Merge branch 'develop'