name change
cursor changes
cursor changes
Merge branch 'master' into gh-pages