sync changelog
Merge pull request #135 from avsm/master

sync changelog