[Text]: Fix for TEXT-39

[Amey Jadiye]

Hi All,

I have made code changes and created PR for
https://issues.apache.org/jira/browse/TEXT-39.
I 'll appreciate if someone take a look at code changes and suggest
improvements.

Thanks,
Amey Jadiye