merged upstream changes
Merge pull request #1 from scopely/merge-changes

Merge changes