Merge branch 'master' into John
main.js color output style change

main.js color output style change
Merge branch 'John'