Update Changelog
Merge pull request #156 from Jako/develop

Update Changelog