diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..d365da40
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+language: go
+
+sudo: false
+
+go:
+  - 1.5.3
+  - 1.6.1
+
+before_install:
+    - mkdir -p $GOPATH/bin
+    - curl -L https://github.com/docker/machine/releases/download/v0.7.0/docker-machine-`uname -s`-`uname -m` > $GOPATH/bin/docker-machine && chmod +x $GOPATH/bin/docker-machine
+    - go get github.com/Azure/go-ansiterm/winterm || true
+    - go get github.com/docker/go-units || true
+    - go get -u -f github.com/scaleway/docker-machine-driver-scaleway
+
+script:
+    docker-machine create -d scaleway -h | grep "scaleway"
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 84d90500..5599219b 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -115,18 +115,18 @@
 		},
 		{
 			"ImportPath": "github.com/scaleway/scaleway-cli/pkg/api",
-			"Comment": "v1.9.0-38-g2277474",
-			"Rev": "227747411d3c77c131bfd0275fa15be79bc62507"
+			"Comment": "v1.9.0-47-g763cffe",
+			"Rev": "763cffeddfd540d930c98bf1548da4f321df353d"
 		},
 		{
 			"ImportPath": "github.com/scaleway/scaleway-cli/pkg/sshcommand",
-			"Comment": "v1.9.0-38-g2277474",
-			"Rev": "227747411d3c77c131bfd0275fa15be79bc62507"
+			"Comment": "v1.9.0-47-g763cffe",
+			"Rev": "763cffeddfd540d930c98bf1548da4f321df353d"
 		},
 		{
 			"ImportPath": "github.com/scaleway/scaleway-cli/pkg/utils",
-			"Comment": "v1.9.0-38-g2277474",
-			"Rev": "227747411d3c77c131bfd0275fa15be79bc62507"
+			"Comment": "v1.9.0-47-g763cffe",
+			"Rev": "763cffeddfd540d930c98bf1548da4f321df353d"
 		},
 		{
 			"ImportPath": "golang.org/x/crypto/curve25519",
diff --git a/README.md b/README.md
index 9d994e2a..0d7c7718 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,9 @@
 
 ## Overview
 
+[![Build
+Status](https://travis-ci.org/scaleway/docker-machine-driver-scaleway.svg?branch=master)](https://travis-ci.org/scaleway/docker-machine-driver-scaleway)
+
 A 3rd-party driver plugin for Docker machine to manage your containers on the servers of Scaleway
 
 ## Setup
diff --git a/vendor/github.com/scaleway/scaleway-cli/pkg/api/api.go b/vendor/github.com/scaleway/scaleway-cli/pkg/api/api.go
index cdc7dbff..e96bc94b 100644
--- a/vendor/github.com/scaleway/scaleway-cli/pkg/api/api.go
+++ b/vendor/github.com/scaleway/scaleway-cli/pkg/api/api.go
@@ -546,7 +546,7 @@ type ScalewayServerPatchDefinition struct {
 	State             *string                    `json:"state,omitempty"`
 	StateDetail       *string                    `json:"state_detail,omitempty"`
 	PrivateIP         *string                    `json:"private_ip,omitempty"`
-	Bootscript        *ScalewayBootscript        `json:"bootscript,omitempty"`
+	Bootscript        *string                    `json:"bootscript,omitempty"`
 	Hostname          *string                    `json:"hostname,omitempty"`
 	Volumes           *map[string]ScalewayVolume `json:"volumes,omitempty"`
 	SecurityGroup     *ScalewaySecurityGroup     `json:"security_group,omitempty"`
@@ -1392,6 +1392,9 @@ func (s *ScalewayAPI) GetImages() (*[]MarketImage, error) {
 		return nil, err
 	}
 	body, err := s.handleHTTPError([]int{200}, resp)
+	if err != nil {
+		return nil, err
+	}
 	var OrgaImages ScalewayImages
 
 	if err = json.Unmarshal(body, &OrgaImages); err != nil {
diff --git a/vendor/github.com/scaleway/scaleway-cli/pkg/api/helpers.go b/vendor/github.com/scaleway/scaleway-cli/pkg/api/helpers.go
index e2f90d79..ab7f1f7d 100644
--- a/vendor/github.com/scaleway/scaleway-cli/pkg/api/helpers.go
+++ b/vendor/github.com/scaleway/scaleway-cli/pkg/api/helpers.go
@@ -313,7 +313,7 @@ func CreateServer(api *ScalewayAPI, c *ConfigCreateServer) (string, error) {
 	server.CommercialType = commercialType
 	server.Volumes = make(map[string]string)
 	server.DynamicIPRequired = &c.DynamicIPRequired
-	if c.CommercialType == "" {
+	if commercialType == "" {
 		return "", errors.New("You need to specify a commercial-type")
 	}
 	if c.IP != "" {