Finished the style
Merge branch 'master' of github.com:alfy32/cs-5410