285 - styles
Merge pull request #299 from gsn/master

285 - styles