Merge pull request #1 from Athou/master

update to new version
Merge pull request #2 from Athou/master

update to new version
missing a character
Merge pull request #199 from linzhe/master

missing a character