fixed some synchronous issues
Merge branch 'master' of https://github.com/trangdang/color-me