Merge pull request #8 from pradpnayak/UCCPAR-402

-- worked on UCCPAR-402
-- worked on UCCPAR-353