register error message
merge conflict
Merge pull request #66 from yuki1107/Shen

Shen