1232
Merge pull request #8 from xq831205gjf/master

1232