Merge branch 'master' of github.com:Tuxion/mokuji