diff --git a/JenkinsLibrary/version.py b/JenkinsLibrary/version.py
index 1ef2fb4..f8428b8 100644
--- a/JenkinsLibrary/version.py
+++ b/JenkinsLibrary/version.py
@@ -1 +1 @@
-VERSION = '0.7.19'
+VERSION = '0.8.0'
diff --git a/README.md b/README.md
index 6f9eab5..9a3ae31 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # robotframework-jenkinslibrary
-[![codecov](https://codecov.io/gh/Panchorn/robotframework-jenkinslibrary/branch/master/graph/badge.svg)](https://codecov.io/gh/Panchorn/robotframework-jenkinslibrary)
+[![codecov](https://codecov.io/gh/robotframework-thailand/robotframework-jenkinslibrary/branch/master/graph/badge.svg)](https://codecov.io/gh/Panchorn/robotframework-jenkinslibrary)
 [![PyPI](https://img.shields.io/pypi/v/robotframework-jenkinslibrary.svg)](https://pypi.org/project/robotframework-jenkinslibrary/)
 
 Jenkins wrapper library for robotframework
@@ -23,7 +23,7 @@ ${job_build_details}=  | Build Jenkins With Parameters And Wait Until Job Done |
 
 ## Document
 For more keyword detail go to the following link:
-https://panchorn.github.io/robotframework-jenkinslibrary/
+https://robotframework-thailand.github.io/robotframework-jenkinslibrary/
 
 ## Uninstall package
 ```bash
diff --git a/setup.py b/setup.py
index 400f837..47ef79b 100644
--- a/setup.py
+++ b/setup.py
@@ -29,8 +29,6 @@
     "Programming Language :: Python :: 3",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    # "Programming Language :: Python :: 2",
-    # "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: 3.6",
@@ -45,7 +43,7 @@
     description="Jenkins wrapper library for robotframework",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://github.com/Panchorn/robotframework-jenkinslibrary.git",
+    url="https://github.com/robotframework-thailand/robotframework-jenkinslibrary.git",
     license="MIT",
     packages=find_packages(),
     package_dir={'robotframework-jenkinslibrary': 'JenkinsLibrary'},