Merge branch 'master' into gh-pages
adjust icon and example tracks
Merge branch 'gh-pages'