Converted tabs to spaces. Minor formatting fixes.
Merge pull request #2 from andytait/master

Converted tabs to spaces. Minor formatting fixes.