fix a bug
fix
Merge branch 'master' into 123456
 Please enter a commit message to explain why this merge is necessary,
test merge master branch
Merge pull request #1 from jiufreeman/master

test pull request