Xiaoying's code
Merge pull request #8 from WhosOutThere/xiaoying

Xiaoying's code