amyshen12 update to xiaoshen12
Merge pull request #1 from Amyshen12/master

amyshen12 update to xiaoshen12