L41 (unfinished)
Merge branch 'master' of https://github.com/manutero/Japanese