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

-- more work on UCCPAR-353