Merge pull request #2 from jakechen/master

Merge