Add support for auto-escaping (as requested in #1)