Merge pull request #1 from julycoding/master

合并
Merge pull request #320 from hejavac/master

Merge pull request #1 from julycoding/master