sync changelog
Merge pull request #131 from avsm/master

sync changelog