Merge pull request #7 from angelleng/master

aha
Merge pull request #10 from beigerice/master

Merge pull request #7 from angelleng/master