Added coding standards.
Typo correction.
Merge branch 'master' into csv-branch
Reformed comments to match standards.