updated changelog
Merge pull request #8 from wick-ed/master

updated changelog