Merge pull request #7 from iamjinge/master

2014-8-10, jiangjin
Merge remote-tracking branch 'upstream/master'