--more changes MISC-40
Merge pull request #3 from pradpnayak/MISC-40

--more changes MISC-40