Merge pull request #136 from justinhrobbins/feature_114

#114 fixing checkstyle warnings
#114 fix checkstyle warnings