EDST-69: please merge this into EDST-51
Merge pull request #5 from manish436/EDST-69

EDST-69: please merge this into EDST-51