Merge pull request #54 from ianbarber/master

Small tidy ups
Replacing tabs with spaces