FIX can't add new function
Merge branch 'master' into gh-pages