diff --git a/stdin-or-argv/go.go b/stdin-or-argv/go.go
new file mode 100644
index 0000000..5718de5
--- /dev/null
+++ b/stdin-or-argv/go.go
@@ -0,0 +1,29 @@
+package main
+
+import (
+	"fmt"
+	// "io"
+    "io/ioutil"
+    "log"
+    // "bufio"
+	"os"
+	"strings"
+)
+
+var usage = "usage: splitter [file]"
+
+func main() {
+    var of *os.File
+    var err error
+	if len(os.Args) == 2 {
+		filename := os.Args[1]
+        of, err = os.Open(filename)
+        if err != nil {
+            log.Fatal(err)
+        }
+	} else {
+        of = os.Stdin
+    }
+    b, err := ioutil.ReadAll(of)
+    fmt.Printf("%v\n", strings.Fields(string(b)))
+}