Jenny changes
Merge pull request #1 from thejennywang/master

Jenny changes