diff --git a/README.md b/README.md
index 85c18c4..05e3ab7 100644
--- a/README.md
+++ b/README.md
@@ -21,17 +21,14 @@ make
 request_timeout=1200s
 threads=4
 
-github_stars_pages="https://api.github.com/users/%s/starred?page=%d"
-github_max_per_page=500
-github_page_num=3
 github_auth_username="user"
 github_auth_password="pass"
 
 gitea_username="user"
 gitea_dest_username="user_or_org"
-gitea_repo_url_tmpl="https://gogs.example.com/api/v1/repos/%s/%s"
-gitea_orgs_url_tmpl="https://git.paulbsd.com/api/v1/orgs/%s"
-gitea_migrate_url="https://gogs.example.com/api/v1/repos/migrate"
+gitea_repo_url_tmpl="https://git.example.com/api/v1/repos/%s/%s"
+gitea_orgs_url_tmpl="https://git.example.com/api/v1/orgs/%s"
+gitea_migrate_url="https://git.example.com/api/v1/repos/migrate"
 gitea_auth_token="token xxxx"
 gitea_mirror=true
 ```
@@ -49,7 +46,7 @@ gitea_mirror=true
 ## License
 
 ```text
-Copyright (c) 2020 PaulBSD
+Copyright (c) 2020, 2021 PaulBSD
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/VERSION b/VERSION
index b63ba69..ee90284 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9
+1.0.4
diff --git a/g2g.ini.sample b/g2g.ini.sample
index 1f3c5da..c0e85ea 100644
--- a/g2g.ini.sample
+++ b/g2g.ini.sample
@@ -2,16 +2,13 @@
 request_timeout=1200s
 threads=4
 
-github_stars_pages="https://api.github.com/users/%s/starred?page=%d"
-github_max_per_page=500
-github_page_num=3
 github_auth_username="user"
 github_auth_password="pass"
 
 gitea_username="user"
 gitea_dest_username="user_or_org"
-gitea_repo_url_tmpl="https://gogs.example.com/api/v1/repos/%s/%s"
-gitea_orgs_url_tmpl="https://gogs.example.com/api/v1/orgs/%s"
-gitea_migrate_url="https://gogs.example.com/api/v1/repos/migrate"
+gitea_repo_url_tmpl="https://git.example.com/api/v1/repos/%s/%s"
+gitea_orgs_url_tmpl="https://git.example.com/api/v1/orgs/%s"
+gitea_migrate_url="https://git.example.com/api/v1/repos/migrate"
 gitea_auth_token="token xxxx"
 gitea_mirror=true
diff --git a/src/config/main.go b/src/config/main.go
index 327ba12..6dad0b1 100644
--- a/src/config/main.go
+++ b/src/config/main.go
@@ -32,8 +32,6 @@ func (config *Config) GetConfig() error {
 type Config struct {
 	G2gRequestTimeout  time.Duration `ini:"g2g_request_timeout"`
 	G2gThreads         int           `ini:"g2g_threads"`
-	GitHubMaxPerPage   int           `ini:"github_max_per_page"`
-	GitHubPageNum      int           `ini:"github_page_num"`
 	GitHubAuthUsername string        `ini:"github_auth_username"`
 	GitHubAuthPassword string        `ini:"github_auth_password"`
 	GitHubContentType  string
diff --git a/src/g2g/main.go b/src/g2g/main.go
index 006077c..dad57ce 100644
--- a/src/g2g/main.go
+++ b/src/g2g/main.go
@@ -17,10 +17,11 @@ import (
 func GetReposFromGitHub(config *config.Config) ([]GitHubRepo, error) {
 	var repopartiallist []GitHubRepo
 	var repofulllist []GitHubRepo
+	var pagenum = 1
 
 	fmt.Println("Getting GitHub starred repos")
-	for num := 1; num <= config.GitHubPageNum; num++ {
-		url := fmt.Sprintf("https://api.github.com/users/%s/starred?per_page=%d&page=%d", config.GitHubAuthUsername, config.GitHubMaxPerPage, num)
+	for {
+		url := fmt.Sprintf("https://api.github.com/users/%s/starred?page=%d", config.GitHubAuthUsername, pagenum)
 		fmt.Println(url)
 
 		resp, err := GetGitHubResponse(config, url)
@@ -38,9 +39,14 @@ func GetReposFromGitHub(config *config.Config) ([]GitHubRepo, error) {
 			return nil, err
 		}
 
+		if len(repopartiallist) == 0 {
+			break
+		}
+
 		for _, elem := range repopartiallist {
 			repofulllist = append(repofulllist, elem)
 		}
+		pagenum++
 	}
 
 	fmt.Printf("%d repositories fetched from Github\n", len(repofulllist))