Merge pull request #27 from swamimalode07/revert-26-main