diff --git a/README.md b/README.md
new file mode 100644
index 0000000..7534e90
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+[eZ Server Monitor](http://www.ezservermonitor.com) (eSM) is a script for monitoring Linux servers. It is available in [Bash](http://www.ezservermonitor.com/esm-sh/features) version and [Web](http://www.ezservermonitor.com/esm-web/features) application.
+
+# eZ Server Monitor `sh
+
+In its [Bash](http://www.ezservermonitor.com/esm-sh/features) version eSM is a simple script that displays on a terminal information such as:
+
+![](http://www.ezservermonitor.com/uploads/esm_sh/esm-sh_dashboard-complete.png)
+
+- **System** : hostname, OS, kernel version, uptime, last boot date, number of current user(s), server datetime
+- **Load average** : percentages showing the CPU load (1 minute, 5 minutes et 15 minutes)
+- **CPU** : model, frequency, cores number, cache L2, bogomips
+- **Memory** : displays free and total memory
+- **Network usage** : displaying the IP address of each network interface (WAN and LAN)
+- **Ping** : ping the hosts defined in the configuration section of the script
+- **Disk usage** : table of each mount point with the space available, used and total
+- **Services** : displays the status (up or down) services defined in the configuration section of the script
+- **Disks and system temperatures** : displays the disks, CPU and motherboard temperatures (optional)
+
+
+You can download the last version [here](http://www.ezservermonitor.com/esm-sh/downloads). The [documentation](http://www.ezservermonitor.com/esm-sh/documentation) describes the script as a whole and also the list of options available.
+
+View more information on the [official website](http://www.ezservermonitor.com/esm-sh/features).
\ No newline at end of file
diff --git a/eZServerMonitor.sh b/eZServerMonitor.sh
index 5a3ff9a..587c0e3 100644
--- a/eZServerMonitor.sh
+++ b/eZServerMonitor.sh
@@ -9,8 +9,8 @@
 #     @name eZ Server Monitor `sh                      #
 #     @author ShevAbam                                 #
 #     @website ezservermonitor.com                     #
-#     @created 2014-04-05                              #
-#     @version 2.0                                     #
+#     @created 2014-06-17                              #
+#     @version 2.1                                     #
 #                                                      #
 # **************************************************** #
 
@@ -19,6 +19,9 @@
 # *                        [ CONFIG ]                        * #
 # ************************************************************ #
 
+# Disk usage - Show or hide virtual mountpoints (tmpfs)
+DISK_SHOW_TMPFS=true
+
 # Service who returns WAN IP
 GET_WAN_IP="http://www.ezservermonitor.com/myip"
 
@@ -26,11 +29,20 @@ GET_WAN_IP="http://www.ezservermonitor.com/myip"
 PING_HOSTS=("google.com" "free.fr" "orange.fr")
 
 # Services port number to check
-# syntax : SERVICES[port_number]="label"
-SERVICES[21]="FTP Server"
-SERVICES[22]="SSH"
-SERVICES[80]="Web Server"
-SERVICES[3306]="Database"
+# syntax : 
+#   SERVICES_NAME[port_number]="label"
+#   SERVICES_HOST[port_number]="localhost"
+SERVICES_NAME[21]="FTP Server"
+SERVICES_HOST[21]="localhost"
+
+SERVICES_NAME[22]="SSH"
+SERVICES_HOST[22]="localhost"
+
+SERVICES_NAME[80]="Web Server"
+SERVICES_HOST[80]="localhost"
+
+SERVICES_NAME[3306]="Database"
+SERVICES_HOST[3306]="localhost"
 
 # Temperatures blocks (true for enable)
 TEMP_ENABLED=false
@@ -42,9 +54,9 @@ TEMP_ENABLED=false
 
 # Constants -- DON'T TOUCH !!
 ESM_NAME="eZ Server Monitor \`sh"
-ESM_VERSION="2.0"
+ESM_VERSION="2.1"
 ESM_AUTHOR="ShevAbam"
-ESM_CREATED="2014-04-05"
+ESM_CREATED="2014-06-17"
 ESM_URL="http://www.ezservermonitor.com"
 
 # Colors
@@ -67,252 +79,279 @@ WHITE_ON_GREY="\e[100;97m"
 # Function : system
 function system()
 {
-	OS=`uname -s`
-	DISTRO=`/usr/bin/lsb_release -ds`
-	HOSTNAME=`hostname`
-	KERNEL_INFO=`/bin/uname -r`
-	
-	UPTIME=`cat /proc/uptime`
-	UPTIME=${UPTIME%%.*}
-	UPTIME_MINUTES=$(( UPTIME / 60 % 60 ))
-	UPTIME_HOURS=$(( UPTIME / 60 / 60 % 24 ))
-	UPTIME_DAYS=$(( UPTIME / 60 / 60 / 24 ))
-
-	LAST_BOOT_DATE=`who -b | awk '{print $3}'`
-	LAST_BOOT_TIME=`who -b | awk '{print $4}'`
-
-	USERS_NB=`who | wc -l`
-
-	CURRENT_DATE=`/bin/date '+%F %T'`
-
-	echo -e "${BOLD}${WHITE_ON_GREY}  System  ${RESET}"
-	echo -e "  ${GREEN}Hostname\t   ${WHITE}$HOSTNAME"
-	echo -e "  ${GREEN}OS\t\t   ${WHITE}$OS $DISTRO"
-	echo -e "  ${GREEN}Kernel\t   ${WHITE}$KERNEL_INFO"
-	echo -e "  ${GREEN}Uptime\t   ${WHITE}$UPTIME_DAYS day(s), $UPTIME_HOURS hours(s), $UPTIME_MINUTES minute(s)"
-	echo -e "  ${GREEN}Last boot\t   ${WHITE}$LAST_BOOT_DATE $LAST_BOOT_TIME"
-	echo -e "  ${GREEN}Current user(s)  ${WHITE}$USERS_NB connected"
-	echo -e "  ${GREEN}Server datetime  ${WHITE}$CURRENT_DATE"
+    OS=`uname -s`
+
+    if [ -e "/usr/bin/lsb_release" ] ; then
+        DISTRO=`/usr/bin/lsb_release -ds`
+    elif [ -e "/etc/fedora-release" ] ; then
+        DISTRO=`cat /etc/fedora-release`
+    elif [ -e "/etc/redhat-release" ] ; then
+        DISTRO=`cat /etc/redhat-release`
+    elif [ -e "/etc/mandriva-release" ] ; then
+        DISTRO=`cat /etc/mandriva-release`
+    elif [ -e "/etc/SuSE-release" ] ; then
+        DISTRO=`cat /etc/SuSE-release`
+    elif [ -e "/etc/centos-release" ] ; then
+        DISTRO=`cat /etc/centos-release`
+    else
+        DISTRO=''
+    fi
+
+    HOSTNAME=`hostname`
+    KERNEL_INFO=`/bin/uname -r`
+    
+    UPTIME=`cat /proc/uptime`
+    UPTIME=${UPTIME%%.*}
+    UPTIME_MINUTES=$(( UPTIME / 60 % 60 ))
+    UPTIME_HOURS=$(( UPTIME / 60 / 60 % 24 ))
+    UPTIME_DAYS=$(( UPTIME / 60 / 60 / 24 ))
+
+    LAST_BOOT_DATE=`who -b | awk '{print $3}'`
+    LAST_BOOT_TIME=`who -b | awk '{print $4}'`
+
+    USERS_NB=`who | wc -l`
+
+    CURRENT_DATE=`/bin/date '+%F %T'`
+
+    echo -e "${BOLD}${WHITE_ON_GREY}  System  ${RESET}"
+    echo -e "  ${GREEN}Hostname\t   ${WHITE}$HOSTNAME"
+    echo -e "  ${GREEN}OS\t\t   ${WHITE}$OS $DISTRO"
+    echo -e "  ${GREEN}Kernel\t   ${WHITE}$KERNEL_INFO"
+    echo -e "  ${GREEN}Uptime\t   ${WHITE}$UPTIME_DAYS day(s), $UPTIME_HOURS hours(s), $UPTIME_MINUTES minute(s)"
+    echo -e "  ${GREEN}Last boot\t   ${WHITE}$LAST_BOOT_DATE $LAST_BOOT_TIME"
+    echo -e "  ${GREEN}Current user(s)  ${WHITE}$USERS_NB connected"
+    echo -e "  ${GREEN}Server datetime  ${WHITE}$CURRENT_DATE"
 }
 
 # Function : load average
 function load_average()
 {
-	PROCESS_NB=`ps -e h | wc -l`
-	PROCESS_RUN=`ps r h | wc -l`
-
-	LOAD_1=`cat /proc/loadavg | awk '{print $1}'`
-	LOAD_1_PERCENT=`echo $LOAD_1 | awk '{print 100 * $1}'`
-	if [ $LOAD_1_PERCENT -ge 100 ] ; then
-		LOAD_1_PERCENT=100;
-	fi
-
-	if [ $LOAD_1_PERCENT -ge 75 ] ; then
-		LOAD_1_COLOR=${RED}
-	elif [ $LOAD_1_PERCENT -ge 50 ] ; then
-		LOAD_1_COLOR=${YELLOW}
-	else
-		LOAD_1_COLOR=${WHITE}
-	fi
-
-	LOAD_2=`cat /proc/loadavg | awk '{print $2}'`
-	# LOAD_2_PERCENT=`echo "$LOAD_2*100" | bc | cut -d . -f 1`
-	LOAD_2_PERCENT=`echo $LOAD_2 | awk '{print 100 * $1}'`
-	if [ $LOAD_2_PERCENT -ge 100 ] ; then
-		LOAD_2_PERCENT=100;
-	fi
-
-	if [ $LOAD_2_PERCENT -ge 75 ] ; then
-		LOAD_2_COLOR=${RED}
-	elif [ $LOAD_2_PERCENT -ge 50 ] ; then
-		LOAD_2_COLOR=${YELLOW}
-	else
-		LOAD_2_COLOR=${WHITE}
-	fi
-
-	LOAD_3=`cat /proc/loadavg | awk '{print $3}'`
-	LOAD_3_PERCENT=`echo $LOAD_3 | awk '{print 100 * $1}'`
-	if [ $LOAD_3_PERCENT -ge 100 ] ; then
-		LOAD_3_PERCENT=100;
-	fi
-
-	if [ $LOAD_3_PERCENT -ge 75 ] ; then
-		LOAD_3_COLOR=${RED}
-	elif [ $LOAD_3_PERCENT -ge 50 ] ; then
-		LOAD_3_COLOR=${YELLOW}
-	else
-		LOAD_3_COLOR=${WHITE}
-	fi
-
-	echo
-	echo -e "${BOLD}${WHITE_ON_GREY}  Load average  ${RESET}"
-	echo -e "  ${GREEN}Since 1 minute     $LOAD_1_COLOR $LOAD_1_PERCENT% ($LOAD_1)"
-	echo -e "  ${GREEN}Since 5 minutes    $LOAD_2_COLOR $LOAD_2_PERCENT% ($LOAD_2)"
-	echo -e "  ${GREEN}Since 15 minutes   $LOAD_3_COLOR $LOAD_3_PERCENT% ($LOAD_3)"
-	echo -e "  ${GREEN}Processus\t      ${WHITE}$PROCESS_NB process, including $PROCESS_RUN running"
+    PROCESS_NB=`ps -e h | wc -l`
+    PROCESS_RUN=`ps r h | wc -l`
+
+    CPU_NB=`cat /proc/cpuinfo | grep "^processor" | wc -l`
+
+    LOAD_1=`cat /proc/loadavg | awk '{print $1}'`
+    # LOAD_1_PERCENT=`echo $LOAD_1 | awk '{print 100 * $1}'`
+    LOAD_1_PERCENT=`echo $(($(echo $LOAD_1 | awk '{print 100 * $1}') / $CPU_NB))`
+    if [ $LOAD_1_PERCENT -ge 100 ] ; then
+        LOAD_1_PERCENT=100;
+    fi
+
+    if [ $LOAD_1_PERCENT -ge 75 ] ; then
+        LOAD_1_COLOR=${RED}
+    elif [ $LOAD_1_PERCENT -ge 50 ] ; then
+        LOAD_1_COLOR=${YELLOW}
+    else
+        LOAD_1_COLOR=${WHITE}
+    fi
+
+    LOAD_2=`cat /proc/loadavg | awk '{print $2}'`
+    # LOAD_2_PERCENT=`echo $LOAD_2 | awk '{print 100 * $1}'`
+    LOAD_2_PERCENT=`echo $(($(echo $LOAD_2 | awk '{print 100 * $1}') / $CPU_NB))`
+    if [ $LOAD_2_PERCENT -ge 100 ] ; then
+        LOAD_2_PERCENT=100;
+    fi
+
+    if [ $LOAD_2_PERCENT -ge 75 ] ; then
+        LOAD_2_COLOR=${RED}
+    elif [ $LOAD_2_PERCENT -ge 50 ] ; then
+        LOAD_2_COLOR=${YELLOW}
+    else
+        LOAD_2_COLOR=${WHITE}
+    fi
+
+    LOAD_3=`cat /proc/loadavg | awk '{print $3}'`
+    # LOAD_3_PERCENT=`echo $LOAD_3 | awk '{print 100 * $1}'`
+    LOAD_3_PERCENT=`echo $(($(echo $LOAD_3 | awk '{print 100 * $1}') / $CPU_NB))`
+    if [ $LOAD_3_PERCENT -ge 100 ] ; then
+        LOAD_3_PERCENT=100;
+    fi
+
+    if [ $LOAD_3_PERCENT -ge 75 ] ; then
+        LOAD_3_COLOR=${RED}
+    elif [ $LOAD_3_PERCENT -ge 50 ] ; then
+        LOAD_3_COLOR=${YELLOW}
+    else
+        LOAD_3_COLOR=${WHITE}
+    fi
+
+    echo
+    echo -e "${BOLD}${WHITE_ON_GREY}  Load average  ${RESET}"
+    echo -e "  ${GREEN}Since 1 minute     $LOAD_1_COLOR $LOAD_1_PERCENT% ($LOAD_1)"
+    echo -e "  ${GREEN}Since 5 minutes    $LOAD_2_COLOR $LOAD_2_PERCENT% ($LOAD_2)"
+    echo -e "  ${GREEN}Since 15 minutes   $LOAD_3_COLOR $LOAD_3_PERCENT% ($LOAD_3)"
+    echo -e "  ${GREEN}Processus\t      ${WHITE}$PROCESS_NB process, including $PROCESS_RUN running"
 }
 
 # Function : CPU
 function cpu()
 {
-	CPU_NB=`cat /proc/cpuinfo | grep "^processor" | wc -l`
-	CPU_INFO=`cat /proc/cpuinfo | grep "^model name" | awk -F": " '{print $2}' | head -1 | sed 's/ \+/ /g'`
-	CPU_FREQ=`cat /proc/cpuinfo | grep "^cpu MHz" | awk -F": " '{print $2}' | head -1`
-	CPU_CACHE=`cat /proc/cpuinfo | grep "^cache size" | awk -F": " '{print $2}' | head -1`
-	CPU_BOGOMIPS=`cat /proc/cpuinfo | grep "^bogomips" | awk -F": " '{print $2}' | head -1`
-
-	echo
-	echo -e "${BOLD}${WHITE_ON_GREY}  CPU  ${RESET}"
-
-	if [ $CPU_NB -gt 1 ] ; then
-		echo -e "  ${GREEN}Number\t ${WHITE}$CPU_NB"
-	fi
-	echo -e "  ${GREEN}Model\t\t ${WHITE}$CPU_INFO"
-	echo -e "  ${GREEN}Frequency\t ${WHITE}$CPU_FREQ MHz"
-	echo -e "  ${GREEN}Cache L2\t ${WHITE}$CPU_CACHE"
-	echo -e "  ${GREEN}Bogomips\t ${WHITE}$CPU_BOGOMIPS"
+    CPU_NB=`cat /proc/cpuinfo | grep "^processor" | wc -l`
+    CPU_INFO=`cat /proc/cpuinfo | grep "^model name" | awk -F": " '{print $2}' | head -1 | sed 's/ \+/ /g'`
+    CPU_FREQ=`cat /proc/cpuinfo | grep "^cpu MHz" | awk -F": " '{print $2}' | head -1`
+    CPU_CACHE=`cat /proc/cpuinfo | grep "^cache size" | awk -F": " '{print $2}' | head -1`
+    CPU_BOGOMIPS=`cat /proc/cpuinfo | grep "^bogomips" | awk -F": " '{print $2}' | head -1`
+
+    echo
+    echo -e "${BOLD}${WHITE_ON_GREY}  CPU  ${RESET}"
+
+    if [ $CPU_NB -gt 1 ] ; then
+        echo -e "  ${GREEN}Number\t ${WHITE}$CPU_NB"
+    fi
+    echo -e "  ${GREEN}Model\t\t ${WHITE}$CPU_INFO"
+    echo -e "  ${GREEN}Frequency\t ${WHITE}$CPU_FREQ MHz"
+    echo -e "  ${GREEN}Cache L2\t ${WHITE}$CPU_CACHE"
+    echo -e "  ${GREEN}Bogomips\t ${WHITE}$CPU_BOGOMIPS"
 }
 
 # Function : memory
 function memory()
 {
-	MEM_FILE='/proc/meminfo'
-	MEM_TOTAL=`grep "^MemTotal" $MEM_FILE | awk -F":" '{print $2}' | sed -e "s/^ *//g"`
-	MEM_FREE=`grep "^MemFree" $MEM_FILE | awk -F":" '{print $2}' | sed -e "s/^ *//g"`
+    MEM_TOTAL=`/usr/bin/free -tmo | grep Mem: | awk '{print $2}'`
+    MEM_FREE=`/usr/bin/free -tmo | grep Mem: | awk '{print $4+$6+$7}'`
 
-	echo
-	echo -e "${BOLD}${WHITE_ON_GREY}  Memory  ${RESET}"
-	echo -e "  ${GREEN}RAM\t${WHITE}$MEM_FREE free of $MEM_TOTAL"
+    echo
+    echo -e "${BOLD}${WHITE_ON_GREY}  Memory  ${RESET}"
+    echo -e "  ${GREEN}RAM\t${WHITE}$MEM_FREE Mb free of $MEM_TOTAL Mb"
 }
 
 # Function : network
 function network()
 {
-	INTERFACES=`/sbin/ifconfig | awk -F "  " '{print $1}' | sed -e '/^$/d'`
+    INTERFACES=`/sbin/ifconfig |awk -F '[/  |: ]' '{print $1}' |sed -e '/^$/d'`
 
-	if [ -e "/usr/bin/curl" ] ; then
-		IP_WAN=`curl -s ${GET_WAN_IP}`
-	else
-		IP_WAN=`wget ${GET_WAN_IP} -O - -o /dev/null`
-	fi
+    if [ -e "/usr/bin/curl" ] ; then
+        IP_WAN=`curl -s ${GET_WAN_IP}`
+    else
+        IP_WAN=`wget ${GET_WAN_IP} -O - -o /dev/null`
+    fi
 
-	echo
-	echo -e "${BOLD}${WHITE_ON_GREY}  Network  ${RESET}"
+    echo
+    echo -e "${BOLD}${WHITE_ON_GREY}  Network  ${RESET}"
 
-	for INTERFACE in $INTERFACES
-	do
-		IP_LAN=`/sbin/ifconfig ${INTERFACE} | awk '$1 == "inet" { split($2,Trunc,":"); print Trunc[2] }'`
-		echo -e "  ${GREEN}IP LAN (${INTERFACE})\t ${WHITE}$IP_LAN"
-	done
+    for INTERFACE in $INTERFACES
+    do
+        IP_LAN=`/sbin/ip -f inet -o addr show ${INTERFACE} | cut -d\  -f 7 | cut -d/ -f 1`
+        echo -e "  ${GREEN}IP LAN (${INTERFACE})\t ${WHITE}$IP_LAN"
+    done
 
-	echo -e "  ${GREEN}IP WAN\t ${WHITE}$IP_WAN"
+    echo -e "  ${GREEN}IP WAN\t ${WHITE}$IP_WAN"
 }
 
 # Function : ping
 function ping()
 {
-	echo
-	echo -e "${BOLD}${WHITE_ON_GREY}  Ping  ${RESET}"
+    echo
+    echo -e "${BOLD}${WHITE_ON_GREY}  Ping  ${RESET}"
 
-	for HOST in ${PING_HOSTS[@]}
-	do
-		PING=`/bin/ping -qc 1 $HOST | awk -F/ '/^rtt/ { print $5 }'`
+    for HOST in ${PING_HOSTS[@]}
+    do
+        PING=`/bin/ping -qc 1 $HOST | awk -F/ '/^rtt/ { print $5 }'`
 
-		echo -e "  ${GREEN}${HOST}\t ${WHITE}$PING ms"
-	done
+        echo -e "  ${GREEN}${HOST}\t ${WHITE}$PING ms"
+    done
 }
 
 # Function : Disk space  (top 5)
 function disk_space()
 {
-	HDD_TOP=`df -h | head -1 | sed s/^/"  "/`
-	#HDD_DATA=`df -hl | grep -v "^Filesystem" | grep -v "^Sys. de fich." | sort -k5r | head -5 | sed s/^/"  "/`
-	HDD_DATA=`df -hl | sed "1 d" | grep -v "^Filesystem" | grep -v "^Sys. de fich." | sort | head -5 | sed s/^/"  "/`
-
-	echo
-	echo -e "${BOLD}${WHITE_ON_GREY}  Disk space (top 5)  ${RESET}"
-	echo -e "${GREEN}$HDD_TOP"
-	echo -e "${WHITE}$HDD_DATA"
+    HDD_TOP=`df -h | head -1 | sed s/^/"  "/`
+    #HDD_DATA=`df -hl | grep -v "^Filesystem" | grep -v "^Sys. de fich." | sort -k5r | head -5 | sed s/^/"  "/`
+    # HDD_DATA=`df -hl | sed "1 d" | grep -v "^Filesystem" | grep -v "^Sys. de fich." | sort | head -5 | sed s/^/"  "/`
+
+    if [ ${DISK_SHOW_TMPFS} = true ] ; then
+        HDD_DATA=`df -hl | sed "1 d" | grep -v "^Filesystem|Sys." | sort | head -5 | sed s/^/"  "/`
+    else
+        HDD_DATA=`df -hl | sed "1 d" | grep -v "^Filesystem|Sys." | grep -vE "^tmpfs|udev|/dev" | sort | head -5 | sed s/^/"  "/`
+    fi
+
+    echo
+    echo -e "${BOLD}${WHITE_ON_GREY}  Disk space (top 5)  ${RESET}"
+    echo -e "${GREEN}$HDD_TOP"
+    echo -e "${WHITE}$HDD_DATA"
 }
 
 # Function : services
 function services()
 {
-	echo
-	echo -e "${BOLD}${WHITE_ON_GREY}  Services  ${RESET}"
-
-	for PORT in "${!SERVICES[@]}"
-	do
-		NAME=${SERVICES[$PORT]}
-		CHECK=`nc -z -w5 localhost $PORT; echo $?`
-
-		if [ $CHECK = 0 ] ; then
-			CHECK_LABEL=${WHITE}ONLINE
-		else
-			CHECK_LABEL=${RED}OFFLINE
-		fi
-
-		echo -e "  ${GREEN}$NAME ($PORT) : ${CHECK_LABEL}${RESET}"
-	done
+    echo
+    echo -e "${BOLD}${WHITE_ON_GREY}  Services  ${RESET}"
+
+    for PORT in "${!SERVICES_NAME[@]}"
+    do
+        NAME=${SERVICES_NAME[$PORT]}
+        HOST=${SERVICES_HOST[$PORT]}
+
+        CHECK=`(exec 3<>/dev/tcp/$HOST/$PORT) &>/dev/null; echo $?`
+
+        if [ $CHECK = 0 ] ; then
+            CHECK_LABEL=${WHITE}ONLINE
+        else
+            CHECK_LABEL=${RED}OFFLINE
+        fi
+
+        echo -e "  ${GREEN}$NAME ($PORT) : ${CHECK_LABEL}${RESET}"
+    done
 }
 
 # Function : hard drive temperatures
 function hdd_temperatures()
 {
-	if [ ${TEMP_ENABLED} = true ] ; then
-		echo
-		echo -e "${BOLD}${WHITE_ON_GREY}  Hard drive Temperatures  ${RESET}"
-
-		DISKS=`ls /sys/block/ | grep -E -i '^(s|h)d'`
-		
-		# If hddtemp is installed
-		if [ -e "/usr/sbin/hddtemp" ] ; then
-
-			for DISK in $DISKS
-			do
-				TEMP_DISK=`hddtemp -n /dev/$DISK`"°C"
-				
-				echo -e "  ${GREEN}/dev/$DISK\t${WHITE}$TEMP_DISK"
-			done
-		else
-			echo -e "${WHITE}\nPlease, install hddtemp${WHITE}"
-		fi
-	fi
+    if [ ${TEMP_ENABLED} = true ] ; then
+        echo
+        echo -e "${BOLD}${WHITE_ON_GREY}  Hard drive Temperatures  ${RESET}"
+
+        DISKS=`ls /sys/block/ | grep -E -i '^(s|h)d'`
+        
+        # If hddtemp is installed
+        if [ -e "/usr/sbin/hddtemp" ] ; then
+
+            for DISK in $DISKS
+            do
+                TEMP_DISK=`hddtemp -n /dev/$DISK`"°C"
+                
+                echo -e "  ${GREEN}/dev/$DISK\t${WHITE}$TEMP_DISK"
+            done
+        else
+            echo -e "${WHITE}\nPlease, install hddtemp${WHITE}"
+        fi
+    fi
 }
 
 # Function : system temperatures
 function system_temperatures()
 {
-	if [ ${TEMP_ENABLED} = true ] ; then
-		echo
-		echo -e "${BOLD}${WHITE_ON_GREY}  System Temperatures  ${RESET}"
-
-		# If lm-sensors is installed
-		if [ -e "/usr/bin/sensors" ] ; then 
-			TEMP_CPU=`/usr/bin/sensors | grep "^CPU Temp" | cut -d '+' -f2 | cut -d '.' -f1`"°C"
-			TEMP_MB=`/usr/bin/sensors | grep "^Sys Temp" | cut -d '+' -f2 | cut -d '(' -f1`
-			
-			echo -e "  ${GREEN}CPU          ${WHITE}$TEMP_CPU"
-			echo -e "  ${GREEN}Motherboard  ${WHITE}$TEMP_MB"
-		else
-			echo -e "${WHITE}\nPlease, install lm-sensors${WHITE}"
-		fi
-	fi
+    if [ ${TEMP_ENABLED} = true ] ; then
+        echo
+        echo -e "${BOLD}${WHITE_ON_GREY}  System Temperatures  ${RESET}"
+
+        # If lm-sensors is installed
+        if [ -e "/usr/bin/sensors" ] ; then 
+            TEMP_CPU=`/usr/bin/sensors | grep "^CPU Temp" | cut -d '+' -f2 | cut -d '.' -f1`"°C"
+            TEMP_MB=`/usr/bin/sensors | grep "^Sys Temp" | cut -d '+' -f2 | cut -d '(' -f1`
+            
+            echo -e "  ${GREEN}CPU          ${WHITE}$TEMP_CPU"
+            echo -e "  ${GREEN}Motherboard  ${WHITE}$TEMP_MB"
+        else
+            echo -e "${WHITE}\nPlease, install lm-sensors${WHITE}"
+        fi
+    fi
 }
 
 # Function : showAll
 function showAll()
 {
-	system
-	load_average
-	cpu
-	memory
-	network
-	ping
-	disk_space
-	services
-	hdd_temperatures
-	system_temperatures
+    system
+    load_average
+    cpu
+    memory
+    network
+    ping
+    disk_space
+    services
+    hdd_temperatures
+    system_temperatures
 }
 
 # Function : showVersion
@@ -356,48 +395,48 @@ function showHelp()
 # *************************************************************** #
 
 if [ $# -ge 1 ] ; then
-	
-	while getopts "Csenpcmltdavhu-:" option
-	do
-		case $option in
-			h | u) showHelp; exit ;;
-			v) showVersion; exit;;
-			C) clear ;;
-			s) system ;;
-			n) network ;;
-			p) ping ;;
-			c) cpu ;;
-			m) memory ;;
-			l) load_average ;;
-			t) hdd_temperatures; system_temperatures ;;
-			d) disk_space ;;
-			e) services ;;
-			a) showAll ;;
-			-) case $OPTARG in
-				  help | usage) showHelp; exit ;;
-				  version) showVersion; exit ;;
-				  all) showAll; exit ;;
-				  clear) clear ;;
-				  system) system ;;
-				  services) services ;;
-				  load) load_average ;;
-				  cpu) cpu ;;
-				  memory) memory ;;
-				  network) network ;;
-				  ping) ping ;;
-				  disk) disk_space ;;
-				  temperatures) hdd_temperatures; system_temperatures ;;
-				  *) exit ;;
-			   esac ;;
-			?) echo "Option -$OPTARG inconnue"; exit ;;
-			*) exit ;;
-		esac
-	done
-	
+    
+    while getopts "Csenpcmltdavhu-:" option
+    do
+        case $option in
+            h | u) showHelp; exit ;;
+            v) showVersion; exit;;
+            C) clear ;;
+            s) system ;;
+            n) network ;;
+            p) ping ;;
+            c) cpu ;;
+            m) memory ;;
+            l) load_average ;;
+            t) hdd_temperatures; system_temperatures ;;
+            d) disk_space ;;
+            e) services ;;
+            a) showAll ;;
+            -) case $OPTARG in
+                  help | usage) showHelp; exit ;;
+                  version) showVersion; exit ;;
+                  all) showAll; exit ;;
+                  clear) clear ;;
+                  system) system ;;
+                  services) services ;;
+                  load) load_average ;;
+                  cpu) cpu ;;
+                  memory) memory ;;
+                  network) network ;;
+                  ping) ping ;;
+                  disk) disk_space ;;
+                  temperatures) hdd_temperatures; system_temperatures ;;
+                  *) exit ;;
+               esac ;;
+            ?) echo "Option -$OPTARG inconnue"; exit ;;
+            *) exit ;;
+        esac
+    done
+    
 else
-	#showAll
-	showHelp;
-	exit;
+    #showAll
+    showHelp;
+    exit;
 fi
 
 echo -e "${WHITE}"