Coding style fixes
Merge pull request #6 from GrahamCampbell/develop

Coding style fixes