Merge pull request #14 from ideawu/master

Master
fix typo
fix ChangeLog typo
Merge pull request #15 from ideawu/dev

Dev