Merge branch 'master' of github.com:shonenada/word.js