Merge branch 'hotfix/0.0.2'
Merge branch 'develop'
update wiki
增加了词性
修正不能通过javadoc的问题
Merge pull request #4 from linkerlin/master

增加了词性
merge develop
Merge branch 'develop'
Merge branch 'release/1.0.0'
Merge branch 'master' into develop