Changelog updated
Merge pull request #32 from phaidon/master

Changelog updated