SOAP-2178
Merge pull request #83 from SmartBear/SOAP-2178

Tested on windows, looks good.