Merge pull request #9 from mariusoe/master

PullRequest
Refactored some code to match checkstyle