Merge pull request #2 from lunny/master

更新到最新版