Merge pull request #2 from virtusize/develop

Develop
Merge branch 'master' into develop