Code style fixes
Merge pull request #44 from htimur/master

Code style fixes