colorize
fixed merge issues
0.1.1