diff --git a/virustotal.example.cnf b/virustotal.example.cnf
new file mode 100644
index 0000000..6b6523e
--- /dev/null
+++ b/virustotal.example.cnf
@@ -0,0 +1,2 @@
+database="evolix.hsb"
+apikey="XXX"
diff --git a/virustotal.sh b/virustotal.sh
index 0160141..d29652d 100644
--- a/virustotal.sh
+++ b/virustotal.sh
@@ -1,16 +1,37 @@
 #!/bin/bash
 # VirusTotal script to add signatures.
-# /!\ Warning. Current API Key is limited to 4 requests per minutes.
+# /!\ Warning. Standard API Key is limited to 4 requests per minutes.
 
-database="evolix.hsb"
-apikey="XXX"
+if [[ -f virustotal.cnf ]]; then
+    source virustotal.cnf
+else
+    echo "You need to set virustotal.cnf file! Exiting..."
+    exit 1
+fi
 file="$1"
 md5=$(md5sum "$file" | cut -d' ' -f1)
 sha256=$(sha256sum "$file" | cut -d' ' -f1)
 size=$(stat -c %s "$file")
-report=$(mktemp virustotal.XXX.tmp)
+report=$(mktemp /tmp/virustotal.XXX.tmp)
+header=$(mktemp /tmp/virustotal.XXX.tmp)
+# Set to false if you want to keep the virus file.
+removeVirus=true
+
+apiReturn() {
+
+    header=$1
+    grep -q "HTTP/1.1 204 No Content" "$header"
+    if [[ $? == 0 ]]; then
+        echo "API Error! Limitation of 4 requests per minutes reached."
+        exit 1
+    fi
+}
 
 echo "Scanning file ${file}..."
+if [[ ! -f "$file" ]]; then
+    echo "File not found!"
+    exit 1
+fi
 # Search if not already in Evolix database.
 grep -q "$sha256" "$database"
 if [[ $? == 0 ]]; then
@@ -19,17 +40,26 @@ if [[ $? == 0 ]]; then
 fi
 
 # Send the file for scanning to VirusTotal.
-curl https://www.virustotal.com/vtapi/v2/file/scan -F file="@${file}" -F apikey="${apikey}" -o /dev/null -s
-# Wait for scan, about 30s, then get the report, parse it and generate a signature.
-sleep 20s
-curl https://www.virustotal.com/vtapi/v2/file/report -F resource="${md5}" -F apikey="${apikey}" -o "$report" -s
+curl https://www.virustotal.com/vtapi/v2/file/scan -F file="@${file}" \
+  -F apikey="${apikey}" -o /dev/null -s -D "$header"
+apiReturn "$header"
+# Wait for scan, about 30s, then get the report.
+# If positive, generate a signature.
+sleep 30s
+curl https://www.virustotal.com/vtapi/v2/file/report -F resource="${md5}" \
+  -F apikey="${apikey}" -o "$report" -s -D "$header"
+apiReturn "$header"
 positives=$(grep -Eo '"positives": [0-9]+' "$report" | grep -Eo '[0-9]+')
 link=$(grep -Eo 'https://.*/' "$report")
 if [[ "$positives" -ge 2 ]]; then
     echo "Virus detected! (${positives} positives)"
     echo "VirusTotal link: $link"
     echo "Adding signature to Evolix database..."
-    echo "${sha256}:${size}:DetectedOnVirusTotal+Evolix" >> $database
+    echo "${sha256}:${size}:DetectedOnVirusTotal+Evolix" >> "$database"
+    if ($removeVirus); then
+        rm "$file"
+        echo "Removed the virus."
+    fi
 else
     echo "No virus detected. Not adding a signature to Evolix database."
 fi