Merge pull request #1 from solita/develop

Merge branch 'master' into develop