Merge branch 'master' of github.com:bjorns/gjut.js