Trying to set the name on save
Merge branch 'master' into gh-pages