Merge pull request #1120 from timlinux/master

Merged develop to master
More realtime refactoring for code compliance
Fix incorrect quote style
Merge remote-tracking branch 'origin' into develop
Merge pull request #1177 from timlinux/develop

Formatting cleanups only