Comments and code style
Merge branch 'master' into diff