Merge pull request #3 from microcai/master

Merge the upstream.
修正 Issue #81
Merge pull request #83 from Gentoo-zh/master

修正 Issue #81