Fixed Formatting
Merge branch 'develop'

* develop:
  Fixed Formatting