Fixing issue with string escaping (#20)