Merge pull request #64 from norzechowicz/code-style

Fixed CS issues