Gitanjali

@hackermd I am unable to add you as one of the reviewers. Please know this PR is ready for your review. Thanks!

@hackermd I have addressed the requested changes. Please let me know if this can be merged? Thank you.