Update changelog
Merge pull request #21 from yola/doug/minor-updates

Update changelog