Update the changelog
Merge pull request #11 from riking/dev

Update the changelog