Merge pull request #4 from viliusle/master

various
Update settings.js
Update glfx.js
changes
changes
changes
Merge pull request #6 from viliusle/gh-pages

merge