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

Coding style fixes
changelog update
Merge remote-tracking branch 'origin/develop' into develop
Merge pull request #343 from panique/develop

Develop