NewFix_SOAP-2161
Merge pull request #65 from SmartBear/NewFix_SOAP-2161

Tested and looks good. Merging it to next.