diff --git a/README.md b/README.md
index 8858239e6..b94ff2fed 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Akarin
-[![Minecraft](https://img.shields.io/badge/Minecraft-1.12.2-blue.svg?style=flat)](https://www.minecraft.net/)
 [![Travis CI](https://travis-ci.org/Akarin-project/Akarin.svg?branch=master)](https://travis-ci.org/Akarin-project/Akarin)
-[![bStats](https://img.shields.io/badge/bStats-Torch-brightgreen.svg?style=flat)](https://bstats.org/plugin/bukkit/Torch)
+[![bStats](https://img.shields.io/badge/bStats-Torch-0099ff.svg?style=flat)](https://bstats.org/plugin/bukkit/Torch)
+[![Powered by](https://img.shields.io/badge/Powered_by-Akarin_project-ee6aa7.svg?style=flat)](https://akarin.io)
 
 Introduction
 ---
@@ -24,7 +24,7 @@ Get Akarin
 
 *Contact me via the email below or open an [Issue](https://github.com/Akarin-project/akarin/issues) if you want to add your website here*
 
-### Building
+### Build
 #### Requirements
 * Java (JDK) 8 or above
 * Maven
diff --git a/circle.yml b/circle.yml
index d9979f1e6..1a67d1690 100644
--- a/circle.yml
+++ b/circle.yml
@@ -9,7 +9,7 @@ dependencies:
     - git config --global user.email "circle@circleci.com"
     - git config --global user.name "CircleCI"
     - chmod +x scripts/inst.sh
-    - ./scripts/inst.sh --setup
+    - ./scripts/inst.sh --setup --remote
 
 test:
   post:
diff --git a/scripts/build.sh b/scripts/build.sh
index 94e837d19..2b200ae3e 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -7,9 +7,14 @@ workdir="$basedir/work"
 paperbasedir="$basedir/work/Paper"
 paperworkdir="$basedir/work/Paper/work"
 
-if [ "$2" == "--setup" ]; then
+if [ "$2" == "--setup" ] || [ "$3" == "--setup" ] || [ "$4" == "--setup" ]; then
 	echo "[Akarin] Setup Paper.."
 	(
+		if [ "$2" == "--remote" ] || [ "$3" == "--remote" ] || [ "$4" == "--remote" ]; then
+			cd "$paperworkdir"
+			git clone https://github.com/Akarin-project/Minecraft.git
+		fi
+		
 		cd "$paperbasedir"
 		./paper jar
 	)
@@ -22,7 +27,7 @@ echo "[Akarin] Ready to build"
 	yes|cp -rf "$basedir/sources/server/pom.xml" "$paperbasedir/Paper-Server/"
 	
 	cd "$paperbasedir"
-	if [ "$2" == "--fast" ] || [ "$3" == "--fast" ]; then
+	if [ "$2" == "--fast" ] || [ "$3" == "--fast" ] || [ "$4" == "--fast" ]; then
 		echo "[Akarin] Test has been skipped"
 		mvn clean install -DskipTests
 	else 
diff --git a/scripts/inst.sh b/scripts/inst.sh
index 920fff5aa..c333d9516 100644
--- a/scripts/inst.sh
+++ b/scripts/inst.sh
@@ -4,7 +4,7 @@
 set -e
 basedir="$pwd"
 
-(git submodule update --init --remote && chmod +x scripts/build.sh && ./scripts/build.sh "$basedir" "$1" "$2") || (
+(git submodule update --init --remote && chmod +x scripts/build.sh && ./scripts/build.sh "$basedir" "$1" "$2" "$3") || (
 	echo "Failed to build Akarin"
 	exit 1
 ) || exit 1