sync changes
Merge pull request #196 from avsm/master

sync changelog