diff --git a/circle.yml b/circle.yml
index 77ae827b..b49b5de0 100644
--- a/circle.yml
+++ b/circle.yml
@@ -5,7 +5,7 @@ machine:
 
 dependencies:
   pre:
-    - sudo apt-get update; sudo apt-get install libusb-1.0-0-dev; cd ~/; git clone https://github.com/steve-m/librtlsdr.git; cd librtlsdr; mkdir build; cd build; cmake ../; make; sudo make install; sudo ldconfig; cd ~/; mkdir gopath; cd ~/; mkdir gopath; wget https://storage.googleapis.com/golang/go1.5.1.src.tar.gz; tar -zxvf go1.5.1.src.tar.gz; cd go/src; export GOROOT_BOOTSTRAP=/usr/local/go; ./make.bash; echo $PATH; echo $GOPATH; go version; env
+    - sudo apt-get update; sudo apt-get install libusb-1.0-0-dev; cd ~/; git clone https://github.com/jpoirier/librtlsdr; cd librtlsdr; mkdir build; cd build; cmake ../; make; sudo make install; sudo ldconfig; cd ~/; mkdir gopath; cd ~/; mkdir gopath; wget https://storage.googleapis.com/golang/go1.6.src.tar.gz; tar -zxvf go1.6.src.tar.gz; cd go/src; export GOROOT_BOOTSTRAP=/usr/local/go; ./make.bash; echo $PATH; echo $GOPATH; go version; env
   override:
     - cd .. ; rm -rf stratux ; git clone --recursive https://github.com/cyoung/stratux ; cd stratux ; make
 
diff --git a/image/spindle/wheezy-stage4 b/image/spindle/wheezy-stage4
index 508dd491..f2821fba 100755
--- a/image/spindle/wheezy-stage4
+++ b/image/spindle/wheezy-stage4
@@ -26,7 +26,7 @@ setup_stratux_bootconfig() {
 	echo "arm_freq=900" >>boot/config.txt
 	echo "sdram_freq=450" >>boot/config.txt
 	echo "core_freq=450" >>boot/config.txt
-	
+
 	#disable serial console
     sed -i boot/cmdline.txt -e "s/console=ttyAMA0,[0-9]\+ //"
 }
@@ -121,8 +121,8 @@ apt-get install -y git cmake libusb-1.0-0.dev build-essential
 
 cd /root
 rm -rf rtl-sdr
-git clone https://github.com/jpoirier/librtlsdr rtl-sdr
-cd rtl-sdr
+git clone https://github.com/jpoirier/librtlsdr
+cd librtlsdr
 mkdir build
 cd build
 cmake ../