Dealt with checkstyle warnings.
Merge pull request #5 from SERG-Delft/checkstyle

Dealt with checkstyle warnings.