Remove whitespaces
Merge branch 'develop'