CheckStyle fixes
Merge pull request #83 from mibrahim/master

CheckStyle fixes #67