Merge pull request #1263 from musashino205/nbm-add-ja