Fixing styles. Thanks Pavana
Merge branch 'master' into gh-pages