Added support for capital letters