-- more work on UCCPAR-353
Merge pull request #5 from pradpnayak/UCCPAR-353

-- more work on UCCPAR-353