Updated Changes Fork Repo

Please review the changes and update original repo