Convert tabs to spaces, parameter declaration fixes, general tidies here and there.
Merge pull request #2 from andytait/master

Convert tabs to spaces, parameter declaration fixes, general tidies here...