Added support for special chars and German