some change
Merge pull request #1 from XinheF/master

some change