small fix of styles 2
Merge branch 'master' into develop