Merge pull request #3 from Jensyn/master

合并
Merge pull request #57 from Glacier759/master

Merge pull request #3 from Jensyn/master