Coding style fixes
Remove tailing white space
Merge pull request #340 from GrahamCampbell/develop

Coding style fixes