Fixed issue with escaping tags. Fixes #16