Add colored output
Merge branch 'dev'