Merge branch 'master'
Changes after meeting with Dima
Merge branch 'develop'