Checkstyle fixes
Merge pull request #86 from mibrahim/master

Checkstyle fixes