import from branch reallyenglish
make portlint happy
Merge pull request #322 from reallyenglish/10_1_tomoyukis

import from branch reallyenglish