diff --git a/Makefile b/Makefile
index a0d36099c..231c09ffe 100644
--- a/Makefile
+++ b/Makefile
@@ -3,16 +3,20 @@ TEST_PATTERN?=.
 TEST_OPTIONS?=
 
 setup: ## Install all the build and lint dependencies
-	@go get -u github.com/alecthomas/gometalinter
-	@go get -u github.com/Masterminds/glide
-	@glide install
-	@gometalinter --install
+	go get -u github.com/alecthomas/gometalinter
+	go get -u github.com/Masterminds/glide
+	glide install
+	gometalinter --install
 
 test: ## Run all the tests
-	@go test $(TEST_OPTIONS) -cover $(SOURCE_FILES) -run $(TEST_PATTERN) -timeout=30s
+	go test $(TEST_OPTIONS) -cover $(SOURCE_FILES) -run $(TEST_PATTERN) -timeout=30s
+
+fmt: ## gofmt and goimports all go files
+	find . -name '*.go' | xargs gofmt -w -s
+	find . -name '*.go' | xargs goimports -w
 
 lint: ## Run all the linters
-	@gometalinter --vendor --disable-all \
+	gometalinter --vendor --disable-all \
 		--enable=deadcode \
 		--enable=ineffassign \
 		--enable=gosimple \
@@ -30,7 +34,7 @@ lint: ## Run all the linters
 ci: lint test ## Run all the tests and code checks
 
 build: ## Build a beta version of releaser
-	@go build
+	go build
 
 # Absolutely awesome: http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
 help:
diff --git a/README.md b/README.md
index e0138f00f..d8fe286cb 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,11 @@ pushes a Homebrew formulae to a repository. All that wrapped in your favorite CI
 This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md).
 By participating, you are expected to uphold this code. Please report unacceptable behavior to root@carlosbecker.com.
 
-[![Build Status](https://travis-ci.org/goreleaser/goreleaser.svg?branch=master)](https://travis-ci.org/goreleaser/goreleaser) [![Go Report Card](https://goreportcard.com/badge/github.com/goreleaser/goreleaser)](https://goreportcard.com/report/github.com/goreleaser/goreleaser) [![Powered By: GoReleaser](https://img.shields.io/badge/powered%20by-goreleaser-green.svg?style=flat-square)](https://github.com/goreleaser)
+[![Release](https://img.shields.io/github/release/goreleaser/goreleaser.svg?style=flat-square)](https://github.com/goreleaser/goreleaser/releases/latest)
+[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
+[![Travis](https://img.shields.io/travis/goreleaser/goreleaser.svg?style=flat-square)](https://travis-ci.org/goreleaser/goreleaser)
+[![Go Report Card](https://goreportcard.com/badge/github.com/goreleaser/goreleaser?style=flat-square)](https://goreportcard.com/report/github.com/goreleaser/goreleaser) 
+[![Powered By: GoReleaser](https://img.shields.io/badge/powered%20by-goreleaser-green.svg?style=flat-square)](https://github.com/goreleaser)
 
 ## How it works?