Deleted unnecessary escapes
Merge branch 'issue#2' into dev