asadiqbal08: Updated branch as per suggestions
asadiqbal08: Addressed PR feedback
mattdrayer: Rebased branch, addressed merge conflict