Merge pull request #72 from fxbonnet/master

Checkstyle warnings