add color
Merge branch 'master' into gibo_manga