Updating the CHANGELOG.md
Merge pull request #172 from burzum/develop

Updating the CHANGELOG.md