Merge branch 'gh-pages'
chart markers
style update
Merge branch 'master' into gh-pages