Patch for review

[Shweta Turakhia]

Hi,
         Can someone please take a look at the patch uploaded for
https://issues.apache.org/jira/browse/LANG-1061

I made the changes as discussed on the jira and updated the unit tests.

Thanks,
Shweta