Merge pull request #234 from vincent4j/master

校对：Structure by miaoiyy