Merge branch 'master' into develop
corrected typo in method name
Merge branch 'develop'