update changelog
Merge pull request #323 from joergkappes/master

update changelog