Convert tabs to spaces. Standards fixes.
Merge pull request #1 from andytait/master

Convert tabs to spaces. Standards fixes.