Style changes
Merge branch 'develop'

Merging Develop