diff --git a/README.md b/README.md
index 212576a..ce6b701 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ List of Docker images
 |OSX / Windows|7.0|24|butomo1989/docker-android-arm-7.0|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-arm-7.0.svg)](https://microbadger.com/images/butomo1989/docker-android-arm-7.0 "Get your own image badge on microbadger.com")|
 |OSX / Windows|7.1.1|25|butomo1989/docker-android-arm-7.1.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-arm-7.1.1.svg)](https://microbadger.com/images/butomo1989/docker-android-arm-7.1.1 "Get your own image badge on microbadger.com")|
 |All |-|-|butomo1989/docker-android-real-device|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-real-device.svg)](https://microbadger.com/images/butomo1989/docker-android-real-device "Get your own image badge on microbadger.com")|
+|All |All|All|butomo1989/docker-android-genymotion|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-genymotion.svg)](https://microbadger.com/images/butomo1989/docker-android-genymotion "Get your own image badge on microbadger.com")|
 
 List of Devices
 ---------------
@@ -176,6 +177,12 @@ You can enable proxy inside container by passing following environment variables
 - HTTPS_PROXY="\<docker\_bridge\_ip\_address>"
 - NO_PROXY="localhost"
 
+Genymotion
+----------
+
+Docker-Android supports [Genymotion Cloud]. What you need is [device.json] and [this sample of docker-compose file].
+
+
 Control android emulator outside container
 ------------------------------------------
 
@@ -320,6 +327,9 @@ Special Thanks
 [example of compose file]: <docker-compose.yml>
 [docker-compose]: <https://docs.docker.com/compose/install/>
 [1.13.0]: <https://github.com/docker/compose/releases/tag/1.13.0>
+[Genymotion Cloud]: <https://cloud.geny.io/signin>
+[device.json]: <genymotion/example/sample_devices/devices.json>
+[this sample of docker-compose file]: <genymotion/example/geny.yml>
 [adb_connection]: <images/adb_connection.png>
 [sms]: <images/SMS.png>
 [gian christanto]: <https://www.linkedin.com/in/gian-christanto-0b398b131/>
diff --git a/geny.yml b/genymotion/example/geny.yml
old mode 100644
new mode 100755
similarity index 82%
rename from geny.yml
rename to genymotion/example/geny.yml
index 0689663..26d5189
--- a/geny.yml
+++ b/genymotion/example/geny.yml
@@ -15,17 +15,16 @@ services:
     image: butomo1989/docker-android-genymotion
     depends_on:
       - selenium_hub
-    privileged: true
     ports:
       - 6080:6080
       - 4723:4723
     volumes:
-      - $PWD/example/sample_apk:/opt
-      - $PWD/genymotion/sample:/root/tmp
+      - $PWD/sample_apk:/opt
+      - $PWD/sample_devices:/root/tmp
     environment:
       - GENY_TEMPLATE=/root/tmp/devices.json
       - USER=xxx
-      - PASS=xxx      
+      - PASS=xxx
       - LICENSE=xxx
       - CONNECT_TO_GRID=True
       - APPIUM=true
diff --git a/genymotion/example/sample_apk/sample_apk_debug.apk b/genymotion/example/sample_apk/sample_apk_debug.apk
new file mode 100644
index 0000000..fcaa8de
Binary files /dev/null and b/genymotion/example/sample_apk/sample_apk_debug.apk differ
diff --git a/genymotion/sample/devices.json b/genymotion/example/sample_devices/devices.json
similarity index 100%
rename from genymotion/sample/devices.json
rename to genymotion/example/sample_devices/devices.json
diff --git a/src/appium.sh b/src/appium.sh
index eae40ad..b4a3c49 100644
--- a/src/appium.sh
+++ b/src/appium.sh
@@ -38,10 +38,13 @@ function run_appium() {
 }
 
 if [[ $REAL_DEVICE = true ]]; then
+	echo "Using real device"
 	run_appium
 elif [[ $GENYMOTION = true ]]; then
+	echo "Using Genymotion"
 	prepare_geny_cloud
 	run_appium
 else
+	echo "Using Emulator"
 	python3 -m src.app
 fi