Move function to correct class...
Merge branch 'master' into lizard5-demo