Merge pull request #74 from rodmcnew/speedsite

fix checkstyle
fix build
Merge remote-tracking branch 'upstream/master' into speedsite