diff --git a/README.MD b/README.MD
index 495aa89..36b9355 100644
--- a/README.MD
+++ b/README.MD
@@ -1,14 +1,13 @@
 # Make your Full Node work
 Get the most value out of your dedicated hardware
 
-
 start at https://github.com/rootzoll/raspiblitz
 
 and continue https://github.com/Stadicus/guides/blob/master/raspibolt/raspibolt_60_bonus.md
 
 More here:
 
-### [Install the Electrum Server in Rust (electrs) on the RaspiBlitz on Dietpi](https://gist.github.com/openoms/8d365f330f5e1288933e0f4874b56dbd)
+### [Install the Electrum Server in Rust (electrs) on the RaspiBlitz](electrs/README.md)
 
 ### [Install OpenBazaar on a RaspiBlitz, install OpenBazaar client and migrate the store contents](https://gist.github.com/openoms/ba843f7c44ff9c7ca0b5a80e12a0aeb4)
 
diff --git a/electrs/README.md b/electrs/README.md
new file mode 100644
index 0000000..f61840d
--- /dev/null
+++ b/electrs/README.md
@@ -0,0 +1,20 @@
+## Install the Electrum Server in Rust (electrs) on a RaspiBlitz
+* tested on the Odroid HC1 and XU4
+
+
+Download this script to your RaspiBlitz:  
+`wget https://github.com/openoms/bitcoin-tutorials/raw/master/electrs/electrs_install_on_RaspiBlitz.sh`  
+make it executable:  
+`sudo chmod +x electrs_install_on_RaspiBlitz.sh`  
+and run:  
+`./electrs_install_on_RaspiBlitz.sh`
+
+
+## Install, configure and run the Electrum wallet on your linux desktop
+Download this script to your linux desktop:  
+`wget https://gist.github.com/openoms/8d365f330f5e1288933e0f4874b56dbd/raw/2cf47bf5cc629e861540f4dd5fa525fd157fc341/electrum_install_config_and_run.sh`  
+make it executable:  
+`sudo chmod +x electrum_install_config_and_run.sh`  
+and run:  
+`./electrum_install_config_and_run.sh`
+
diff --git a/electrs/electrs_install_on_RaspiBlitz.sh b/electrs/electrs_install_on_RaspiBlitz.sh
index a73a921..36cb2c5 100644
--- a/electrs/electrs_install_on_RaspiBlitz.sh
+++ b/electrs/electrs_install_on_RaspiBlitz.sh
@@ -1,35 +1,36 @@
 # Download this script to your RaspiBlitz:
-# $ wget https://gist.github.com/openoms/8d365f330f5e1288933e0f4874b56dbd/raw/2cf47bf5cc629e861540f4dd5fa525fd157fc341/electrs_install_on_RaspiBlitz.sh
+# $ wget https://github.com/openoms/bitcoin-tutorials/raw/master/electrs/electrs_install_on_RaspiBlitz.sh
 # make it executable:
-# $ sudo chmod +x install_electrs_on_RaspiBlitz.sh
+# $ sudo chmod +x electrs_install_on_RaspiBlitz.sh
 # and run:
-# $ ./install_electrs_on_RaspiBlitz.sh
+# $ ./electrs_install_on_RaspiBlitz.sh
 
 # https://github.com/romanz/electrs/blob/master/doc/usage.md
-echo""
-echo"***"
-echo " Installing Rust - press 1 and [ENTER] when prompted"
-echo"***"
+echo ""
+echo "***"
+echo "Installing Rust - press 1 and [ENTER] when prompted"
+echo "***"
+echo ""
 curl https://sh.rustup.rs -sSf | sh
 
 source $HOME/.cargo/env
 sudo apt update
 sudo apt install -y clang cmake  # for building 'rust-rocksdb'
-
-echo""
-echo"***"
-echo "Downloading and building electrs. This will  will take ~ 30 minutes" # ~ 33 min on an Odroid HC1
-echo"***"
-echo""
+ 
+echo ""
+echo "***"
+echo "Downloading and building electrs. This will take ~30 minutes" # ~ 33 min on an Odroid HC1
+echo "***"
+echo ""
 git clone https://github.com/romanz/electrs
 cd electrs
 cargo build --release
-
-echo""
-echo"***"
-echo "The electrs database will be built in /mnt/hdd/electrs/db. Takes ~ 18 hours and ~38Gb diskspace"
-echo"***"
-echo""
+ 
+echo ""
+echo "***"
+echo "The electrs database will be built in /mnt/hdd/electrs/db. Takes ~18 hours and ~38Gb diskspace"
+echo "***"
+echo ""
 
 sudo mkdir /mnt/hdd/electrs
 sudo chown -R admin:admin /mnt/hdd/electrs
diff --git a/electrs/electrum_install_config_and_run.sh b/electrs/electrum_install_config_and_run.sh
index afb11a8..330df4e 100644
--- a/electrs/electrum_install_config_and_run.sh
+++ b/electrs/electrum_install_config_and_run.sh
@@ -10,9 +10,19 @@
 sudo apt-get install python3-pyqt5
 # Download package: 	
 wget https://download.electrum.org/3.3.4/Electrum-3.3.4.tar.gz
-#Verify signature: 	
+
+#Verify signature:
+gpg --import ThomasV.asc
 wget https://download.electrum.org/3.3.4/Electrum-3.3.4.tar.gz.asc
-gpg --verify Electrum-3.3.4.tar.gz.asc
+verifyResult=$(gpg --verify Electrum-3.3.4.tar.gz.asc 2>&1)
+goodSignature=$(echo ${verifyResult} | grep 'Good signature' -c)
+echo "goodSignature(${goodSignature})"
+if [ ${goodSignature} -lt 1 ]; then
+  echo ""
+  echo "!!! BUILD FAILED --> PGP Verify not OK / signature(${goodSignature})"
+  exit 1
+fi
+
 # Run without installing: 	tar -xvf Electrum-3.3.4.tar.gz
 # python3 Electrum-3.3.4/run_electrum
 # Install with PIP: