commit message
Merge https://github.com/juntaro/jee7