Fixed whitespace
Merge branch 'develop'