diff --git a/.gitignore b/.gitignore
index a70d6385ae..2e228c8a6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ project.xcworkspace
 .idea
 .gradle
 local.properties
+syng-im.iml
 
 # node.js
 #
diff --git a/run-osx.sh b/run-osx.sh
index 2af9a51ec0..7fde17010b 100755
--- a/run-osx.sh
+++ b/run-osx.sh
@@ -28,15 +28,24 @@ function tab () {
 EOF
 }
 
+if [ ! -z $1 ]
+then
+ device_type="$1"
+else
+ device_type="genymotion"
+fi
+
+if [ "$device_type" = "genymotion" ]
+then
 # Find Device based on Android version 6.0.0
 device=$(/Applications/Genymotion\ Shell.app/Contents/MacOS/genyshell -c "devices list" | grep "6.0.0")
-
-echo ${device##*| }
+#echo ${device##*| }
 # Launch device in Genymotion
 open -a /Applications/Genymotion.app/Contents/MacOS/player.app --args --vm-name "${device##*| }"
+fi
 
 # Install deps, prepare for genymotion and figwheel
-re-natal deps && re-natal use-android-device genymotion && re-natal use-figwheel
+re-natal deps && re-natal use-android-device "${device_type}" && re-natal use-figwheel
 
 # open figwheel in new tab
 tab "lein figwheel android"
@@ -49,4 +58,4 @@ sleep 10s
 
 adb reverse tcp:8081 tcp:8081 && adb reverse tcp:3449 tcp:3449
 
-react-native run-android
\ No newline at end of file
+react-native run-android