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

Standards adherence.