Merge pull request #26 from Vdimir/master

Style, friends