Small fixes
Merge branch 'origin/develop'
Merge branch 'origin/master'