diff --git a/drone/agent/exec.go b/drone/agent/exec.go
index 8ca91bb2c..43af6f74e 100644
--- a/drone/agent/exec.go
+++ b/drone/agent/exec.go
@@ -83,6 +83,11 @@ func (r *pipeline) run() error {
 		})
 	}
 
+	var lastStatus string
+	if w.BuildLast != nil {
+		lastStatus = w.BuildLast.Status
+	}
+
 	trans := []compiler.Transform{
 		builtin.NewCloneOp("git", true),
 		builtin.NewCacheOp(
@@ -105,7 +110,7 @@ func (r *pipeline) run() error {
 		builtin.NewAliasOp(prefix),
 		builtin.NewPullOp(r.config.pull),
 		builtin.NewFilterOp(
-			model.StatusSuccess, // TODO(bradrydzewski) please add the last build status here
+			lastStatus,
 			w.Build.Branch,
 			w.Build.Event,
 			w.Build.Deploy,
@@ -218,36 +223,38 @@ func pushRetry(client client.Client, w *queue.Work) {
 
 func toEnv(w *queue.Work) map[string]string {
 	envs := map[string]string{
-		"CI":                   "drone",
-		"DRONE":                "true",
-		"DRONE_ARCH":           "linux_amd64",
-		"DRONE_REPO":           w.Repo.FullName,
-		"DRONE_REPO_SCM":       w.Repo.Kind,
-		"DRONE_REPO_OWNER":     w.Repo.Owner,
-		"DRONE_REPO_NAME":      w.Repo.Name,
-		"DRONE_REPO_LINK":      w.Repo.Link,
-		"DRONE_REPO_AVATAR":    w.Repo.Avatar,
-		"DRONE_REPO_BRANCH":    w.Repo.Branch,
-		"DRONE_REPO_PRIVATE":   fmt.Sprintf("%v", w.Repo.IsPrivate),
-		"DRONE_REPO_TRUSTED":   fmt.Sprintf("%v", w.Repo.IsTrusted),
-		"DRONE_REMOTE_URL":     w.Repo.Clone,
-		"DRONE_COMMIT_SHA":     w.Build.Commit,
-		"DRONE_COMMIT_REF":     w.Build.Ref,
-		"DRONE_COMMIT_BRANCH":  w.Build.Branch,
-		"DRONE_COMMIT_LINK":    w.Build.Link,
-		"DRONE_COMMIT_MESSAGE": w.Build.Message,
-		"DRONE_AUTHOR":         w.Build.Author,
-		"DRONE_AUTHOR_EMAIL":   w.Build.Email,
-		"DRONE_AUTHOR_AVATAR":  w.Build.Avatar,
-		"DRONE_BUILD_NUMBER":   fmt.Sprintf("%d", w.Build.Number),
-		"DRONE_BUILD_EVENT":    w.Build.Event,
-		"DRONE_BUILD_CREATED":  fmt.Sprintf("%d", w.Build.Created),
-		"DRONE_BUILD_STARTED":  fmt.Sprintf("%d", w.Build.Started),
-		"DRONE_BUILD_FINISHED": fmt.Sprintf("%d", w.Build.Finished),
-		"DRONE_YAML_VERIFIED":  fmt.Sprintf("%v", w.Verified),
-		"DRONE_YAML_SIGNED":    fmt.Sprintf("%v", w.Signed),
-		"DRONE_BRANCH":         w.Build.Branch,
-		"DRONE_COMMIT":         w.Build.Commit,
+		"CI":                         "drone",
+		"DRONE":                      "true",
+		"DRONE_ARCH":                 "linux_amd64",
+		"DRONE_REPO":                 w.Repo.FullName,
+		"DRONE_REPO_SCM":             w.Repo.Kind,
+		"DRONE_REPO_OWNER":           w.Repo.Owner,
+		"DRONE_REPO_NAME":            w.Repo.Name,
+		"DRONE_REPO_LINK":            w.Repo.Link,
+		"DRONE_REPO_AVATAR":          w.Repo.Avatar,
+		"DRONE_REPO_BRANCH":          w.Repo.Branch,
+		"DRONE_REPO_PRIVATE":         fmt.Sprintf("%v", w.Repo.IsPrivate),
+		"DRONE_REPO_TRUSTED":         fmt.Sprintf("%v", w.Repo.IsTrusted),
+		"DRONE_REMOTE_URL":           w.Repo.Clone,
+		"DRONE_COMMIT_SHA":           w.Build.Commit,
+		"DRONE_COMMIT_REF":           w.Build.Ref,
+		"DRONE_COMMIT_BRANCH":        w.Build.Branch,
+		"DRONE_COMMIT_LINK":          w.Build.Link,
+		"DRONE_COMMIT_MESSAGE":       w.Build.Message,
+		"DRONE_COMMIT_AUTHOR":        w.Build.Author,
+		"DRONE_COMMIT_AUTHOR_EMAIL":  w.Build.Email,
+		"DRONE_COMMIT_AUTHOR_AVATAR": w.Build.Avatar,
+		"DRONE_BUILD_NUMBER":         fmt.Sprintf("%d", w.Build.Number),
+		"DRONE_BUILD_EVENT":          w.Build.Event,
+		"DRONE_BUILD_STATUS":         w.Build.Status,
+		"DRONE_BUILD_LINK":           fmt.Sprintf("%s/%s/%d", w.System.Link, w.Repo.FullName, w.Build.Number),
+		"DRONE_BUILD_CREATED":        fmt.Sprintf("%d", w.Build.Created),
+		"DRONE_BUILD_STARTED":        fmt.Sprintf("%d", w.Build.Started),
+		"DRONE_BUILD_FINISHED":       fmt.Sprintf("%d", w.Build.Finished),
+		"DRONE_YAML_VERIFIED":        fmt.Sprintf("%v", w.Verified),
+		"DRONE_YAML_SIGNED":          fmt.Sprintf("%v", w.Signed),
+		"DRONE_BRANCH":               w.Build.Branch,
+		"DRONE_COMMIT":               w.Build.Commit,
 	}
 
 	if w.Build.Event == model.EventTag {
diff --git a/yaml/matrix.go b/yaml/matrix.go
index 5cb6e3763..47b6768f1 100644
--- a/yaml/matrix.go
+++ b/yaml/matrix.go
@@ -29,6 +29,12 @@ func (a Axis) String() string {
 
 // ParseMatrix parses the Yaml matrix definition.
 func ParseMatrix(data []byte) ([]Axis, error) {
+
+	axis, err := parseMatrixList(data)
+	if err == nil && len(axis) != 0 {
+		return axis, nil
+	}
+
 	matrix, err := parseMatrix(data)
 	if err != nil {
 		return nil, err
@@ -98,3 +104,14 @@ func parseMatrix(raw []byte) (Matrix, error) {
 	err := yaml.Unmarshal(raw, &data)
 	return data.Matrix, err
 }
+
+func parseMatrixList(raw []byte) ([]Axis, error) {
+	data := struct {
+		Matrix struct {
+			Include []Axis
+		}
+	}{}
+
+	err := yaml.Unmarshal(raw, &data)
+	return data.Matrix.Include, err
+}
diff --git a/yaml/matrix_test.go b/yaml/matrix_test.go
index aec2ca097..d819cff13 100644
--- a/yaml/matrix_test.go
+++ b/yaml/matrix_test.go
@@ -30,6 +30,16 @@ func TestMatrix(t *testing.T) {
 			g.Assert(err == nil).IsTrue()
 			g.Assert(axis == nil).IsTrue()
 		})
+
+		g.It("Should return included axis", func() {
+			axis, err := ParseMatrixString(fakeMatrixInclude)
+			g.Assert(err == nil).IsTrue()
+			g.Assert(len(axis)).Equal(2)
+			g.Assert(axis[0]["go_version"]).Equal("1.5")
+			g.Assert(axis[1]["go_version"]).Equal("1.6")
+			g.Assert(axis[0]["python_version"]).Equal("3.4")
+			g.Assert(axis[1]["python_version"]).Equal("3.4")
+		})
 	})
 }
 
@@ -49,3 +59,12 @@ matrix:
     - 2.6
     - 2.8
 `
+
+var fakeMatrixInclude = `
+matrix:
+  include:
+    - go_version: 1.5
+      python_version: 3.4
+    - go_version: 1.6
+      python_version: 3.4
+`