diff --git a/zshrc b/zshrc
index ba87527..58b11fa 100644
--- a/zshrc
+++ b/zshrc
@@ -11,14 +11,18 @@
 # Uncomment this line for perfomance analysis
 #zmodload zsh/zprof
 
-export PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:~/bin:/opt/cuda/bin:~/.cargo/bin
+export PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:~/bin:/opt/cuda/bin:~/.cargo/bin:~/go/bin
+# Add ruby gems to path
+if which ruby >/dev/null && which gem >/dev/null; then
+    PATH="$(ruby -r rubygems -e 'puts Gem.user_dir')/bin:$PATH"
+fi
 export EDITOR=/usr/bin/vim
 # Prevent mime associations by wine
 export WINEPREFIX="$HOME/.wine"
 export WINEDLLOVERRIDES="winemenubuilder.exe=d"
 export CUDA_ROOT=/opt/cuda
 # Android SDK setup
-export ANDROID_HOME="$HOME/.android"
+export ANDROID_HOME="/opt/android-sdk"
 export PATH="$PATH:$ANDROID_HOME/tools/bin:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools"
 
 # Configuration for virtualenv