Merge pull request #11 from beigerice/master

Merge pull request #8 from angelleng/master