Sync CHANGES
Merge pull request #17 from avsm/master

Sync CHANGES