text edit
Merge pull request #14 from 1919kemao9/20141108_02

text edit