Helps to actually call the functions...
Merge branch 'master' into gh-pages