updated changelog
Merge pull request #1 from jasonly/working

updated changelog