Merge branch 'master' into gh-pages
fix green curve index
Merge branch 'gh-pages'