Merge pull request #3 from Jensyn/master

合并