Merge pull request #2 from angelleng/master