EDST-68: please merge into EDST-51
Merge pull request #4 from manish436/EDST-68

EDST-68: please merge into EDST-51