Merge pull request #3 from mockizart/develop

Merge branch 'master' into develop