Improved standards adherence, tidied up whitespace etc.
Merge pull request #2 from andytait/master

Improved standards adherence, tidied up whitespace etc.