restyled
Merge pull request #264 from jay-hodgson/SWC-535

restyled