diff --git a/.travis.yml b/.travis.yml
index ac260fd..7865a1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,23 +2,18 @@ language: go
 
 go: 
  - 1.13
+ 
+env: GO111MODULE=on
 
-jobs:
-  include:
-    - stage: test-build
-      skip_cleanup: true
-      script: go build -o webp-server-linux-amd64 webp-server.go
-      script: ls
+script: GOARCH=amd64 go build -o webp-server-linux-amd64 webp-server.go
 
-    - stage: GitHub Release
-      script: echo "Deploying to GitHub releases ..."
-      deploy:
-        provider: releases
-        api_key: $GITHUB_OAUTH_TOKEN
-        skip_cleanup: true
-        file:
-            - webp-server
-        on:
-            repo: webp-sh/webp_server_go
-            tags: false
-            branch: add-travis-ci
\ No newline at end of file
+deploy:
+  provider: releases
+  api_key: $GITHUB_OAUTH_TOKEN
+  skip_cleanup: true
+  file:
+      - webp-server-linux-amd64
+  on:
+      repo: webp-sh/webp_server_go
+      tags: true
+      branch: master
\ No newline at end of file
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..844fe22
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,13 @@
+GOCMD=go
+GOBUILD=$(GOCMD) build
+GOCLEAN=$(GOCMD) clean
+GOTEST=$(GOCMD) test
+GOGET=$(GOCMD) get
+BINARY_NAME=webp-server
+BINARY_LINUX=$(BINARY_NAME)_linux-amd64
+
+all: build
+build: 
+		$(GOBUILD) -o $(BINARY_LINUX) -v
+test: 
+		$(GOTEST) -v ./...
\ No newline at end of file