Merge pull request #1 from webhat/develop

Develop