diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..0114f85f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,11 @@
+OUT=nyaa
+
+all: build
+
+build: $(OUT)
+
+$(OUT):
+	godep go build -ldflags "-X main.buildversion=$(git rev-parse HEAD)"
+
+clean:
+	go clean 
diff --git a/utils/crypto/crypto.go b/utils/crypto/crypto.go
index 0f00182e..34a84ec2 100644
--- a/utils/crypto/crypto.go
+++ b/utils/crypto/crypto.go
@@ -4,6 +4,7 @@ import (
 	"crypto/md5"
 	"crypto/rand"
 	"fmt"
+	"io"
 	"strings"
 )
 
@@ -31,7 +32,7 @@ func GenerateRandomToken32() (string, error) {
 // GenerateRandomToken : Generates a random token int n long
 func GenerateRandomToken(n int) (string, error) {
 	token := make([]byte, n)
-	_, err := rand.Read(token)
+	_, err := io.ReadFull(rand.Reader, token)
 	// %x	base 16, lower-case, two characters per byte
 	return fmt.Sprintf("%x", token), err