Merge PR #25 and PR #27 into fix-conflicts-and-merge, resolving all conflicts#28

root-Manas merged 8 commits into

mainroot-Manas/macaron:mainfrom

copilot/fix-conflicts-and-mergeroot-Manas/macaron:copilot/fix-conflicts-and-mergeCopy head branch name to clipboard