diff --git a/.codeclimate.yml b/.codeclimate.yml
deleted file mode 100644
index 58f3ff854ca..00000000000
--- a/.codeclimate.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-engines:
-  gofmt:
-    enabled: true
-  golint:
-    enabled: true
-  govet:
-    enabled: true
-ratings:
-  paths:
-  - "**.go"
-exclude_paths:
-- web/**/*
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 772db866dce..4e0f8f67fa5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,15 @@
 language: go
 
 go:	
+ - 1.7
  - tip
 
+before_install:
+ - go get -t -v ./...
+
+script:
+ - go test -race -coverprofile=coverage.txt -covermode=atomic
+
 install:
  - go get github.com/gorilla/websocket
  - go get github.com/toorop/go-pusher
diff --git a/README.md b/README.md
index a97f6b6a012..d7d6dee6f8d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 ## Cryptocurrency trading bot written in Golang
-
 [![Build Status](https://travis-ci.org/thrasher-/gocryptotrader.svg?branch=master)](https://travis-ci.org/thrasher-/gocryptotrader)
-[![Test Coverage](https://codecov.io/github/thrasher-/gocryptotrader/coverage.svg?branch=master)](https://codecov.io/github/thrasher-/gocryptotrader?branch=master)
+[![Software License](https://img.shields.io/badge/License-MIT-orange.svg?style=flat-square)](https://github.com/thrasher-/gocryptotrader/blob/master/LICENSE)
+[![GoDoc](https://godoc.org/github.com/thrasher-/gocryptotrader?status.svg)](https://godoc.org/github.com/thrasher-/gocryptotrader)
+[![Coverage Status](http://codecov.io/github/thrasher-/gocryptotrader/coverage.svg?branch=master)](http://codecov.io/github/thrasher-/gocryptotrader?branch=master)
 
 A cryptocurrency trading bot supporting multiple exchanges written in Golang.