- changed handling of string case
- matched rules to wikipedia