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

Coding style fixes