changelog update
Merge pull request #339 from panique/develop

changelog update