Merge pull request #1 from springside/master

合并原作者的更新