Integrate https://github.com/supereggbert/GLGE/pull/101
Merge branch 'master' into gh-pages