Merge pull request #2 from akhotan10/master

update
Merge pull request #9 from jyzhou831/master

Merge pull request #2 from akhotan10/master