Merge remote-tracking branch 'upstream/master'
changes made
Merge pull request #3 from smasterson/next-branch

Next branch