Merge pull request #2 from Jensyn/master

add to merge
Merge pull request #6 from wangduoxiong/master

Merge pull request #2 from Jensyn/master