Fix #374 shellescape problem

I fixed shellescape problem and tests.
I tested it, but it is not under Windows.  Can you test this fix before including?