Added escaping from Felix Geisendörfer (changes in comments)