Merge pull request #2 from kevinzhow/master

Update