Added support for more characters as described in issue #25