diff --git a/dev/n_obackup.sh b/dev/n_obackup.sh
index 7c2f3bb..f328e91 100755
--- a/dev/n_obackup.sh
+++ b/dev/n_obackup.sh
@@ -5,7 +5,7 @@ PROGRAM="obackup"
 AUTHOR="(C) 2013-2016 by Orsiris de Jong"
 CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
 PROGRAM_VERSION=2.1-dev
-PROGRAM_BUILD=2016080803
+PROGRAM_BUILD=2016080804
 IS_STABLE=yes
 
 source "./ofunctions.sh"
@@ -559,8 +559,8 @@ function GetDiskSpaceLocal {
 			Logger "Cannot get disk space in [$path_to_check] on local system." "ERROR"
 			Logger "Command Output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID)" "ERROR"
         	else
-                	DISK_SPACE=$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID | tail -1 | awk '{print $4}')
-                	DRIVE=$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID | tail -1 | awk '{print $1}')
+                	DISK_SPACE=$(tail -1 "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID" | awk '{print $4}')
+                	DRIVE=$(tail -1 "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID" | awk '{print $1}')
         	fi
         else
                 Logger "Storage path [$path_to_check] does not exist." "CRITICAL"
@@ -585,8 +585,8 @@ function GetDiskSpaceRemote {
 		Logger "Command Output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID)" "ERROR"
 		return 1
         else
-               	DISK_SPACE=$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID | tail -1 | awk '{print $4}')
-               	DRIVE=$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID | tail -1 | awk '{print $1}')
+               	DISK_SPACE=$(tail -1 "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID" | awk '{print $4}')
+               	DRIVE=$(tail -1 "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID" | awk '{print $1}')
         fi
 }
 
diff --git a/dev/shellcheck.sh b/dev/shellcheck.sh
new file mode 100755
index 0000000..f661eb6
--- /dev/null
+++ b/dev/shellcheck.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+#SC2120 = only for debug version
+
+shellcheck -e SC2086,SC2119,SC2120 $1