- Replaced non-standard calls to String.contains (fixes #1)