Updated the version from the main repo and prepare for pull request to the main repo