Resolved CORE-2156
Merge pull request #39 from anand1711/master

Resolved CORE-2156