VAT-389 Resubmit the changes with some modifications.
Merge pull request #25 from dpradeep/VAT-389-New

VAT-389 Resubmit the changes with some modifications.