change something
Merge pull request #56 from zhangyaochun/master

change something