Merge pull request #247 from reallyenglish/mitsuruy

apply reallyenglish's patches