Fix checkstyle warnings
Merge pull request #64 from michaelnflx/master

Fix checkstyle warnings