Merge pull request #25 from kariminf/master

fixes DzCoding/JapKatsuyou#21 and fixes DzCoding/JapKatsuyou#22 and fixe...
Merge pull request #26 from kariminf/master

fixes DzCoding/JapKatsuyou#14