worked on EER-25
Merge pull request #2 from mayurjadhav/EER-25

worked on EER-25