changed function name a little
Merge branch 'master' into gh-pages