Standards adherence.
Merge pull request #7 from andytait/master

Standards adherence.