Reformat code and extended checkstyle
Merge pull request #14 from mkalb/checkstyle

Reformat code and extended checkstyle