Merge branch 'master' into develop
Merge pull request #2 from hashie5/develop

Merge branch 'master' into develop