add type check in escape filter (fixes #62)
Merge remote-tracking branch 'origin/master'