Fixed silly mistake - commented out func call
Merge branch 'master' into gh-pages