update changelog
Merge pull request #8 from matje/master

update changelog