modify by hiver
Merge pull request #1 from nyanhan/master

modify by hiver