major style changes
Merge branch 'master' into walter
Merged