Cleaned up code to conform to strict style.
Merge remote-tracking branch 'origin/master'