Merge pull request #487 from spyhunter99/feature/changelog2

3.0.0-git-22