Checkstyle fixes
Merge pull request #87 from mibrahim/master

Checkstyle fixes