Checkstyle fixes
Merge branch 'master' of github.com:MovingBlocks/TeraMath into master2