diff --git a/.travis.yml b/.travis.yml
index 4faa6286..8cc512a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,13 +4,13 @@ dist: trusty
 os:
 - linux
 go:
-- 1.8.7
-- 1.9.3
-- "1.10.1"
-- tip
+- 1.8.x
+- 1.9.x
+- 1.10.x
+- master
 script:
 - go test ./...
 - GOARCH=386 go test ./...
 matrix:
   allow_failures:
-  - go: tip
+  - go: master
diff --git a/README.md b/README.md
index a5afab3f..b4f8dda8 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/go-python/gpython.svg?branch=master)](https://travis-ci.org/go-python/gpython)
 [![GoDoc](https://godoc.org/github.com/go-python/gpython?status.svg)](https://godoc.org/github.com/go-python/gpython)
+[![License](https://img.shields.io/badge/License-BSD--3-blue.svg)](https://github.com/go-python/gpython/blob/master/LICENSE)
 
 gpython is a part re-implementation / part port of the Python 3.4
 interpreter to the Go language, "batteries not included".
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 00000000..7e922524
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,19 @@
+build: off
+
+clone_folder: c:\gopath\src\github.com\go-python\gpython
+
+branches:
+  only:
+    - master
+
+environment:
+  GOPATH: c:\gopath
+  PATH: '%GOPATH%\bin;%PATH%'
+
+stack: go 1.10
+
+build_script:
+  - go get -v -t -race ./...
+
+test_script:
+  - go test -race ./...
diff --git a/go.mod b/go.mod
new file mode 100644
index 00000000..be655164
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,6 @@
+module github.com/go-python/gpython
+
+require (
+	github.com/mattn/go-runewidth v0.0.3 // indirect
+	github.com/peterh/liner v0.0.0-20180619022028-8c1271fcf47f
+)