Merge pull request #12 from pradpnayak/UCCPAR-353

-- worked on UCCPAR-353
-- fixed for UCCPAR-353