unify style
merge ready
Merge pull request #5 from starzel/unify_style

unify style