minor
Merge branch 'master' into gh-pages
doc
Merge branch 'gh-pages' of github.com:nodeGame/JSUS into gh-pages