[Fixes #11] Added escaped chars and other fixes