SWC-1715
Merge pull request #2 from john-hill/SWC-1715

SWC-1715