Refactor code
Change to use spaces instead of tabs (for everything)
Merge branch 'release/0.4.0'