diff --git a/Makefile b/Makefile
index acda29a..1e44d52 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 
 include $(GOROOT)/src/Make.inc
 
-TARG=github.com/mmitton/asn1-ber
+TARG=github.com/hsoj/asn1-ber
 GOFILES=\
 	ber.go\
 
diff --git a/ber.go b/ber.go
index 058fd48..ba72243 100644
--- a/ber.go
+++ b/ber.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
    "io"
-   "os"
 	"reflect"
 )
 
@@ -167,7 +166,7 @@ func resizeBuffer( in []byte, new_size uint64 ) (out []byte) {
    return
 }
 
-func readBytes( reader io.Reader, buf []byte ) os.Error {
+func readBytes( reader io.Reader, buf []byte ) error {
    idx := 0
    buflen := len( buf )
    for idx < buflen {
@@ -180,7 +179,7 @@ func readBytes( reader io.Reader, buf []byte ) os.Error {
    return nil
 }
 
-func ReadPacket( reader io.Reader ) ( *Packet, os.Error) {
+func ReadPacket( reader io.Reader ) ( *Packet, error) {
    buf := make([]byte, 2)
    err := readBytes( reader, buf )
    if err != nil {
@@ -383,7 +382,7 @@ func Encode( ClassType, TagType, Tag uint8, Value interface{}, Description strin
    p.Description = Description
 
 	if Value != nil {
-		v := reflect.NewValue(Value)
+		v := reflect.ValueOf(Value)
 
 		if ( ClassType == ClassUniversal ) {
 			switch Tag {