Modified the email address
resolve the merge conflict
added the original code
Merge pull request #5 from pulkit21/2-3-stable

Modified the email address