Merge pull request #2 from pradpnayak/UCCPAR-394

-- worked on UCCPAR-394, code cleanup and improvement
-- more work on UCCPAR-394