Update changelog
Merge pull request #191 from sdeleuze/master

Update changelog