Updated ChangeLog
Merge pull request #158 from christeredvartsen/develop

Updated ChangeLog