Keywords: added support for case insensitivity