Merge remote-tracking branch 'remotes/upstream/master'
Merge pull request #2 from msrba/master

Merge remote-tracking branch 'remotes/upstream/master'