few changes
Merge pull request #26 from millesky87/style_update

few changes
git pull upstream master updates