Fixed typo
CS fixes
Merge branch 'develop'