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

Standards fixes.