Sync changes from upstream repository
Merge pull request #598 from github/update-1410539410
Merge pull request #4 from github/master

Merge pull request #4 from github/update-2fdc884