Merge pull request #1 from angelleng/master

aaa
Merge pull request #2 from beigerice/master

Merge pull request #1 from angelleng/master