Merge pull request #1154 in master
Small typo fix
Merge pull request #1165
Merge pull request #1165 in develop