Merge pull request #6 from pradpnayak/UCCPAR-353

-- worked on UCCPAR-353
-- more work on UCCPAR-353