diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..d8f5270
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,26 @@
+# Golang CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-go/ for more details
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version
+      - image: circleci/golang:1.9
+      
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/postgres:9.4
+
+    #### TEMPLATE_NOTE: go expects specific checkout path representing url
+    #### expecting it in the form of
+    ####   /go/src/github.com/circleci/go-tool
+    ####   /go/src/bitbucket.org/circleci/go-tool
+    working_directory: /go/src/github.com/{{ORG_NAME}}/{{REPO_NAME}}
+    steps:
+      - checkout
+
+      # specify any bash command here prefixed with `run: `
+      - run: make test
+      - run: make vet
\ No newline at end of file
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..6aa13e0
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+PKG_LIST =  $$( go list ./...  | grep -v /vendor/ | grep -v "zxcvbn-go/data" )
+
+.DEFAULT_GOAL := help
+
+.PHONY: help
+help:
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+.PHONY: test
+test: ## Run `go test {Package list}` on the packages
+	go test $(PKG_LIST)
+
+.PHONY: lint
+lint: ## Run `golint {Package list}`
+	golint $(PKG_LIST)
\ No newline at end of file