Fix for escaping strings

This should fix Issue #171 and preserve the fix for #152