Merge pull request  from julycoding/master

Merge pull request  from julycoding/master