diff --git a/geekWeather2.sh b/geekWeather2.sh
index e798492..a63f633 100755
--- a/geekWeather2.sh
+++ b/geekWeather2.sh
@@ -26,9 +26,27 @@ fi
 
 cd `dirname $0`
 
+# rawurl code from http://stackoverflow.com/questions/296536/urlencode-from-a-bash-script
+rawurlencode() {
+  local string="${1}"
+  local strlen=${#string}
+  local encoded=""
+
+  for (( pos=0 ; pos<strlen ; pos++ )); do
+     c=${string:$pos:1}
+     case "$c" in
+        [-_.~a-zA-Z0-9] ) o="${c}" ;;
+        * )               printf -v o '%%%02x' "'$c"
+     esac
+     encoded+="${o}"
+  done
+  echo "${encoded}"    # You can either set a return variable (FASTER) 
+  REPLY="${encoded}"   #+or echo the result (EASIER)... or both... :p
+}
+
 export TEMPLATE_URL='http://forecast.io/embed/#lat=$LAT&lon=$LON&name=$NAME&static-skycons=1&hide-header=1'
 
-export URL=$(echo $TEMPLATE_URL | sed -e "s/\$LAT/$1/" -e "s/\$LON/$2/" -e "s/\$NAME/$3/")
+export URL=$(echo $TEMPLATE_URL | sed -e "s/\$LAT/$1/" -e "s/\$LON/$2/" -e "s/\$NAME/$( rawurlencode "$3" )/")
 
 echo "Converting to image"
 webkit2png --width=300 --height=150 -F --transparent --delay=5 -o tmpWeather -D /tmp $URL
@@ -42,3 +60,4 @@ elif [[ $4 == "DARK" ]]; then
 fi
 
 exit 0
+