Merge pull request #24 from millesky87/style_update

Style update