Update CHANGELOG
Merge pull request #30 from regru/master

Update CHANGELOG