diff --git a/bitmask-core b/bitmask-core
index e372171b7c36a5429a3260ffcd274c5b3806cd74..7a64a5a349cfe88a70b1bee7787a4db867bd323a 160000
--- a/bitmask-core
+++ b/bitmask-core
@@ -1 +1 @@
-Subproject commit e372171b7c36a5429a3260ffcd274c5b3806cd74
+Subproject commit 7a64a5a349cfe88a70b1bee7787a4db867bd323a
diff --git a/build_core.sh b/build_core.sh
index 3abe7de8eecf6be03594d9fa6f121028e1ff13dd..612512ba10b476cd016791b60afdb7e467cd680f 100755
--- a/build_core.sh
+++ b/build_core.sh
@@ -86,8 +86,11 @@ showtitle "Getting gomobile"
 ./golang/go/bin/go install golang.org/x/mobile/cmd/gomobile || quit "./golang/go/bin/go install golang.org/x/mobile/cmd/gomobile"
 
 showtitle "initiating gomobile"
-./golang/bin/gomobile init || quit "./golang/bin/gomobile init"
-
+if [[ -z ${GOBIN} ]]; then
+  ./golang/bin/gomobile init || quit "./golang/bin/gomobile init"
+else
+  $GOBIN/gomobile init ||  quit "$GOBIN/gomobile init"
+fi
 
 # -------- prepare snowflake ---------------
 showtitle "Checking out snowflake repository"
@@ -117,19 +120,19 @@ fi
 
 
 showtitle "Building Bitmask Core Android as full aar"
-gomobile bind -x -target android -ldflags="-s -w" -tags=netcgo -androidapi=21 -v -trimpath -o lib/bitmaskcore.aar ./obfsvpn/client/ ./motd ./IPtProxy/IPtProxy.go ./bitmask-core/pkg/bootstrap ./bitmask-core/pkg/models
+gomobile bind -x -target android -ldflags="-s -w" -tags=netcgo -androidapi=21 -v -trimpath -o lib/bitmaskcore.aar ./obfsvpn/client/ ./motd ./IPtProxy/IPtProxy.go ./bitmask-core/pkg/mobile
 
 showtitle "Building Bitmask Core Android Web as full aar including pgpverify"
-gomobile bind -x -target='android' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_web.aar -v ./pgpverify ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/bootstrap ./bitmask-core/pkg/models
+gomobile bind -x -target='android' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_web.aar -v ./pgpverify ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/mobile
 
 showtitle "Building Bitmask Core Android for armv7"
-gomobile bind -target='android/arm' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/bootstrap ./bitmask-core/pkg/models
+gomobile bind -target='android/arm' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/mobile
 
 showtitle "Building Bitmask Core Android for x86"
-gomobile bind -target='android/386' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/bootstrap ./bitmask-core/pkg/models
+gomobile bind -target='android/386' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/mobile
 
 showtitle "Building Bitmask Core Android for arm64"
-gomobile bind -target='android/arm64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/bootstrap ./bitmask-core/pkg/models
+gomobile bind -target='android/arm64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/mobile
 
 showtitle "Building Bitmask Core Android for x86_64"
-gomobile bind -target='android/amd64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86_64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/bootstrap ./bitmask-core/pkg/models
+gomobile bind -target='android/amd64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86_64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/mobile
diff --git a/build_core_dev.sh b/build_core_dev.sh
index 8031ef952554edb0e0670929c77c9f21f7101378..126799cb5596c44b774c5a31d6a4094b595f1689 100755
--- a/build_core_dev.sh
+++ b/build_core_dev.sh
@@ -105,7 +105,11 @@ showtitle "Getting gomobile"
 ./golang/go/bin/go install golang.org/x/mobile/cmd/gomobile || quit "./golang/go/bin/go install golang.org/x/mobile/cmd/gomobile"
 
 showtitle "initiating gomobile"
-./golang/bin/gomobile init || quit "./golang/bin/gomobile init"
+if [[ -z ${GOBIN} ]]; then
+  ./golang/bin/gomobile init || quit "./golang/bin/gomobile init"
+else
+  $GOBIN/gomobile init ||  quit "$GOBIN/gomobile init"
+fi
 
 
 
@@ -123,22 +127,21 @@ fi
 
 
 showtitle "Building Bitmask Core Android as full aar"
-gomobile bind -x -target android -ldflags="-s -w" -tags=netcgo -androidapi=21 -v -trimpath -o lib/bitmaskcore.aar ./obfsvpn/client/ ./motd ./IPtProxy/IPtProxy.go ./bitmask-core/pkg/bootstrap ./bitmask-core/pkg/models
-
+gomobile bind -x -target android -ldflags="-s -w" -tags=netcgo -androidapi=21 -v -trimpath -o lib/bitmaskcore.aar ./obfsvpn/client/ ./motd ./IPtProxy/IPtProxy.go ./bitmask-core/pkg/mobile
 showtitle "Building Bitmask Core Android Web as full aar including pgpverify"
-gomobile bind -x -target='android' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_web.aar -v ./pgpverify ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/bootstrap ./bitmask-core/pkg/models
+gomobile bind -x -target='android' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_web.aar -v ./pgpverify ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/mobile
 
 showtitle "Building Bitmask Core Android for armv7"
-gomobile bind -target='android/arm' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/bootstrap ./bitmask-core/pkg/models
+gomobile bind -target='android/arm' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/mobile
 
 showtitle "Building Bitmask Core Android for x86"
-gomobile bind -target='android/386' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/bootstrap ./bitmask-core/pkg/models
+gomobile bind -target='android/386' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/mobile
 
 showtitle "Building Bitmask Core Android for arm64"
-gomobile bind -target='android/arm64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/bootstrap ./bitmask-core/pkg/models
+gomobile bind -target='android/arm64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/mobile
 
 showtitle "Building Bitmask Core Android for x86_64"
-gomobile bind -target='android/amd64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86_64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/bootstrap ./bitmask-core/pkg/models
+gomobile bind -target='android/amd64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86_64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd ./bitmask-core/pkg/mobile
 
 if [[ "bitmask_android" == `pwd | rev | cut -d / -f 2 | rev` ]]; then 
     showtitle "Copying to bitmask_android main repository"