checkstyle 1 from sam
Merge remote-tracking branch 'origin/initial' into initial