Update changelog
Merge pull request #116 from sdeleuze/master

Update changelog