diff --git a/runner/settings.go b/runner/settings.go
index 61e2412..2eff333 100644
--- a/runner/settings.go
+++ b/runner/settings.go
@@ -5,6 +5,7 @@ import (
 	"github.com/pilu/config"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"time"
@@ -113,7 +114,11 @@ func tmpPath() string {
 }
 
 func buildName() string {
-	return settings["build_name"]
+	n := settings["build_name"]
+	if runtime.GOOS == "windows" {
+		n += ".exe"
+	}
+	return n
 }
 func buildPath() string {
 	return filepath.Join(tmpPath(), buildName())
diff --git a/runner/start.go b/runner/start.go
index b382dc3..82b8561 100644
--- a/runner/start.go
+++ b/runner/start.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"runtime"
 	"strings"
-	"syscall"
 	"time"
 )
 
@@ -88,16 +87,6 @@ func initLogFuncs() {
 	appLog = newLogFunc("app")
 }
 
-func initLimit() {
-	var rLimit syscall.Rlimit
-	rLimit.Max = 10000
-	rLimit.Cur = 10000
-	err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
-	if err != nil {
-		fmt.Println("Error Setting Rlimit ", err)
-	}
-}
-
 func setEnvVars() {
 	os.Setenv("DEV_RUNNER", "1")
 	wd, err := os.Getwd()
diff --git a/runner/start_unix.go b/runner/start_unix.go
new file mode 100644
index 0000000..2156aee
--- /dev/null
+++ b/runner/start_unix.go
@@ -0,0 +1,18 @@
+// +build !windows
+
+package runner
+
+import (
+	"fmt"
+	"syscall"
+)
+
+func initLimit() {
+	var rLimit syscall.Rlimit
+	rLimit.Max = 10000
+	rLimit.Cur = 10000
+	err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
+	if err != nil {
+		fmt.Println("Error Setting Rlimit ", err)
+	}
+}
diff --git a/runner/start_windows.go b/runner/start_windows.go
new file mode 100644
index 0000000..3c32ff6
--- /dev/null
+++ b/runner/start_windows.go
@@ -0,0 +1,4 @@
+package runner
+
+func initLimit() {
+}