Changelog master

Edited the previous pull request #98
Maria, you left some conflicts marks here.