Converted tabs to spaces for consistent whitespace

Also adjusted some indentation accordingly
Merge pull request #9 from DeX3/qa

Converted tabs to spaces for consistent whitespace