Merge branch 'upstream' into develop
Update change log in README
Merge pull request #153 from tpkelly/develop

Update README changelog