Changelog master

Edited the previous pull request #98