Merge pull request #237 from claco/master

Add CHANGELOG.md