General Clean-up
Fix next color issue
Merge branch 'master' into gh-pages

* master:
  Fix next color issue
  General Clean-up