Merge pull request #1 from gridnow/master

pull过来