Merge branch 'master' into develop
small improvements
Merge branch 'develop'