Merge branch 'master' of https://github.com/nilproject/NiL.JS.git