added support for short words