SWC-466
Merge pull request #232 from dburdick/develop

SWC-466