fixed bug in styles
Merge branch 'master'