update ChangeLog
Merge pull request #121 from pjona/master

update changelog