Made escape of escape characters more efficient
Merge branch 'kostas'