Added escaping
First commit
Fixed merge conflicts