add more explanation
Merge branch 'master' into Japanese