Fix for issue #34

See #34 

I also fixed a few comments to make checkstyle validation pass.