Merge branch 'release/0.4' into develop
Convert tabs to spaces
Merge branch 'develop'

* develop:
  Convert tabs to spaces