diff --git a/association_test.go b/association_test.go
index 60d0cf48..fa289afa 100644
--- a/association_test.go
+++ b/association_test.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"github.com/DMXRoid/gorm"
 )
 
 func TestBelongsTo(t *testing.T) {
diff --git a/callbacks_test.go b/callbacks_test.go
index a58913d7..02364302 100644
--- a/callbacks_test.go
+++ b/callbacks_test.go
@@ -3,7 +3,7 @@ package gorm_test
 import (
 	"errors"
 
-	"github.com/jinzhu/gorm"
+	"github.com/DMXRoid/gorm"
 
 	"reflect"
 	"testing"
diff --git a/customize_column_test.go b/customize_column_test.go
index c236ac24..805d989e 100644
--- a/customize_column_test.go
+++ b/customize_column_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jinzhu/gorm"
+	"github.com/DMXRoid/gorm"
 )
 
 type CustomizeColumn struct {
diff --git a/dialects/mssql/mssql.go b/dialects/mssql/mssql.go
index 8c2360fc..ab71c099 100644
--- a/dialects/mssql/mssql.go
+++ b/dialects/mssql/mssql.go
@@ -12,7 +12,7 @@ import (
 
 	// Importing mssql driver package only in dialect file, otherwide not needed
 	_ "github.com/denisenkom/go-mssqldb"
-	"github.com/jinzhu/gorm"
+	"github.com/DMXRoid/gorm"
 )
 
 func setIdentityInsert(scope *gorm.Scope) {
diff --git a/errors_test.go b/errors_test.go
index 9a428dec..0704f97e 100644
--- a/errors_test.go
+++ b/errors_test.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"github.com/DMXRoid/gorm"
 )
 
 func TestErrorsCanBeUsedOutsideGorm(t *testing.T) {
diff --git a/field_test.go b/field_test.go
index 715661f0..ee061022 100644
--- a/field_test.go
+++ b/field_test.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"github.com/DMXRoid/gorm"
 )
 
 type CalculateField struct {
diff --git a/join_table_handler.go b/join_table_handler.go
index 14f65ffa..fc747ea2 100644
--- a/join_table_handler.go
+++ b/join_table_handler.go
@@ -178,7 +178,7 @@ func (s JoinTableHandler) JoinWith(handler JoinTableHandlerInterface, db *DB, so
 			joinConditions = append(joinConditions, fmt.Sprintf("%v.%v = %v.%v", quotedTableName, scope.Quote(foreignKey.DBName), destinationTableName, scope.Quote(foreignKey.AssociationDBName)))
 		}
 		joinConditions = append(joinConditions, s.ArbitraryJoinConditions...)
-
+		fmt.Println(joinConditions)
 		var foreignDBNames []string
 		var foreignFieldNames []string
 
diff --git a/join_table_test.go b/join_table_test.go
index 6d5f427d..19376dcf 100644
--- a/join_table_test.go
+++ b/join_table_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jinzhu/gorm"
+	"github.com/DMXRoid/gorm"
 )
 
 type Person struct {
diff --git a/main.go b/main.go
index e24638a6..67b69805 100644
--- a/main.go
+++ b/main.go
@@ -51,10 +51,10 @@ const (
 //       db, err := gorm.Open("mysql", "user:password@/dbname?charset=utf8&parseTime=True&loc=Local")
 //     }
 // GORM has wrapped some drivers, for easier to remember driver's import path, so you could import the mysql driver with
-//    import _ "github.com/jinzhu/gorm/dialects/mysql"
-//    // import _ "github.com/jinzhu/gorm/dialects/postgres"
-//    // import _ "github.com/jinzhu/gorm/dialects/sqlite"
-//    // import _ "github.com/jinzhu/gorm/dialects/mssql"
+//    import _ "github.com/DMXRoid/gorm/dialects/mysql"
+//    // import _ "github.com/DMXRoid/gorm/dialects/postgres"
+//    // import _ "github.com/DMXRoid/gorm/dialects/sqlite"
+//    // import _ "github.com/DMXRoid/gorm/dialects/mssql"
 func Open(dialect string, args ...interface{}) (db *DB, err error) {
 	if len(args) == 0 {
 		err = errors.New("invalid database source")
diff --git a/main_test.go b/main_test.go
index 35474cf3..747cd6b8 100644
--- a/main_test.go
+++ b/main_test.go
@@ -15,11 +15,11 @@ import (
 	"time"
 
 	"github.com/erikstmartin/go-testdb"
-	"github.com/jinzhu/gorm"
-	_ "github.com/jinzhu/gorm/dialects/mssql"
-	_ "github.com/jinzhu/gorm/dialects/mysql"
-	"github.com/jinzhu/gorm/dialects/postgres"
-	_ "github.com/jinzhu/gorm/dialects/sqlite"
+	"github.com/DMXRoid/gorm"
+	_ "github.com/DMXRoid/gorm/dialects/mssql"
+	_ "github.com/DMXRoid/gorm/dialects/mysql"
+	"github.com/DMXRoid/gorm/dialects/postgres"
+	_ "github.com/DMXRoid/gorm/dialects/sqlite"
 	"github.com/jinzhu/now"
 )
 
diff --git a/migration_test.go b/migration_test.go
index d94ec9ec..ab00c1c6 100644
--- a/migration_test.go
+++ b/migration_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jinzhu/gorm"
+	"github.com/DMXRoid/gorm"
 )
 
 type User struct {
diff --git a/naming_test.go b/naming_test.go
index 0c6f7713..24a486bd 100644
--- a/naming_test.go
+++ b/naming_test.go
@@ -3,7 +3,7 @@ package gorm_test
 import (
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"github.com/DMXRoid/gorm"
 )
 
 func TestTheNamingStrategy(t *testing.T) {
diff --git a/preload_test.go b/preload_test.go
index dd29fb5e..1b98794e 100644
--- a/preload_test.go
+++ b/preload_test.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"github.com/DMXRoid/gorm"
 )
 
 func getPreloadUser(name string) *User {
diff --git a/query_test.go b/query_test.go
index 15bf8b3c..eb089c2a 100644
--- a/query_test.go
+++ b/query_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/jinzhu/gorm"
+	"github.com/DMXRoid/gorm"
 
 	"testing"
 	"time"
diff --git a/scaner_test.go b/scaner_test.go
index 9e251dd6..6d1f1fe4 100644
--- a/scaner_test.go
+++ b/scaner_test.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"github.com/DMXRoid/gorm"
 )
 
 func TestScannableSlices(t *testing.T) {
diff --git a/scope_test.go b/scope_test.go
index f7f1ed08..b328fbaf 100644
--- a/scope_test.go
+++ b/scope_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/jinzhu/gorm"
+	"github.com/DMXRoid/gorm"
 )
 
 func NameIn1And2(d *gorm.DB) *gorm.DB {
diff --git a/update_test.go b/update_test.go
index 85d53e5f..3e773eeb 100644
--- a/update_test.go
+++ b/update_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jinzhu/gorm"
+	"github.com/DMXRoid/gorm"
 )
 
 func TestUpdate(t *testing.T) {