updated ChangeLog
Merge pull request #23 from cfriedt/master-local

updated ChangeLog