diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9b5181..1b3a2fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,10 @@
 ## CHANGELOG:
-* v1.8d - Added Ubuntu docker image for Sn1per (@menzow)
-* v1.8d - Added SNMP port 162/tcp checks (@hexageek)
-* v1.8d - Fixed install.sh dependency duplicates
+* v1.9 - Added Ubuntu docker image for Sn1per (@menzow)
+* v1.9 - Added automatic loot directory sorting for all modes
+* v1.9 - Added MSSQL port 1433/tcp checks
+* v1.9 - Added SNMP port 162/tcp checks (@hexageek)
+* v1.9 - Added nslookup to install.sh
+* v1.9 - Fixed install.sh dependency duplicates
 * v1.8c - Added -A option to all NMap port scans
 * v1.8c - Fixed install.sh permission issue
 * v1.8c - Fixed install.sh cleanup options
diff --git a/README.md b/README.md
index 4efba38..2bccdb8 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,13 @@
-# Sn1per - Automated Pentest Recon Scanner
+<img src="Sn1per-logo.png" alt="" /># Sn1per - Automated Pentest Recon Scanner
 ![alt tag](https://github.com/1N3/Sn1per/blob/master/Sn1per-logo.png)
+![alt tag](https://www.helpnetsecurity.com/images/posts/Sn1per2.jpg)
 
 ## ABOUT:
 Sn1per is an automated scanner that can be used during a penetration test to enumerate and scan for vulnerabilities. 
 
+## DEMO VIDEO:
+[![Sn1per Demo](https://img.youtube.com/vi/nA_V_u3QZA4/0.jpg)](https://www.youtube.com/watch?v=nA_V_u3QZA4)
+
 ## FEATURES:
 * Automatically collects basic recon (ie. whois, ping, DNS, etc.)
 * Automatically launches Google hacking queries against a target domain
diff --git a/install.sh b/install.sh
index 4d25d79..23f187f 100644
--- a/install.sh
+++ b/install.sh
@@ -29,7 +29,7 @@ cp -Rf $PWD/* $INSTALL_DIR
 cd $INSTALL_DIR
 
 echo -e "$OKORANGE + -- --=[Installing package dependencies...$RESET"
-apt-get install ruby rubygems python dos2unix zenmap sslyze uniscan xprobe2 cutycapt unicornscan waffit host whois dirb dnsrecon curl nmap php5 php5-curl hydra iceweasel wpscan sqlmap nbtscan enum4linux cisco-torch metasploit-framework theharvester dnsenum nikto smtp-user-enum whatweb sslscan amap
+apt-get install ruby nslookup rubygems python dos2unix zenmap sslyze uniscan xprobe2 cutycapt unicornscan waffit host whois dirb dnsrecon curl nmap php5 php5-curl hydra iceweasel wpscan sqlmap nbtscan enum4linux cisco-torch metasploit-framework theharvester dnsenum nikto smtp-user-enum whatweb sslscan amap
 pip install dnspython colorama tldextract urllib3 ipaddress
 
 echo -e "$OKORANGE + -- --=[Installing gem dependencies...$RESET"
diff --git a/sniper b/sniper
index 1285bcc..a5b7325 100644
--- a/sniper
+++ b/sniper
@@ -1,5 +1,5 @@
 #!/bin/bash
-# + -- --=[Sn1per v1.8 by 1N3
+# + -- --=[Sn1per v1.9 by 1N3
 # + -- --=[http://crowdshield.com
 #
 # Sn1per - Automated Pentest Recon Tool
@@ -69,7 +69,7 @@ if [ -z $TARGET ]; then
 	echo -e "$OKRED               /_/                 $RESET"
 	echo -e ""
 	echo -e "$OKORANGE + -- --=[http://crowdshield.com$RESET"
-	echo -e "$OKORANGE + -- --=[sn1per v1.8 by 1N3$RESET"
+	echo -e "$OKORANGE + -- --=[sn1per v1.9 by 1N3$RESET"
 	echo -e "$OKORANGE + -- --=[Usage: sn1per <target>$RESET"
 	echo ""
 	exit
@@ -160,6 +160,21 @@ fi
 if [ "$MODE" = "web" ]; then
 	if [ "$OPT1" = "report" ]; then
 		./sniper $TARGET $MODE | tee ./loot/sniper-$TARGET-$MODE-`date +%Y%m%d%H%M`.txt 2>&1
+		cd $PWD/loot/
+		echo -e "$OKORANGE + -- --=[Sorting loot directory ($PWD)"
+		mkdir reports/ -p 2> /dev/null
+		echo -e "$OKORANGE + -- --=[Generating reports..."
+		for a in `ls sniper-*.txt 2>/dev/null`; do echo "$a" >> reports/$a && sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" $a > reports/$a; done
+		mv $PWD/report-* $PWD/reports/ 2> /dev/null
+		mkdir $PWD/screenshots/ -p 2> /dev/null
+		mv $PWD/*.jpg $PWD/screenshots/ 2> /dev/null
+		mkdir $PWD/nmap -p 2> /dev/null
+		mv $PWD/*.xml $PWD/nmap/ 2> /dev/null
+		mkdir $PWD/domains -p 2> /dev/null
+		mv $PWD/domains-* $PWD/domains/ 2> /dev/null
+		mkdir $PWD/output -p 2> /dev/null
+		mv $PWD/sniper-* $PWD/output 2> /dev/null
+		rm -f $PWD/.fuse_* 2> /dev/null
 		exit
 	fi
 fi
@@ -177,7 +192,7 @@ if [ "$MODE" = "stealth" ]; then
 	echo -e "$OKRED               /_/                 $RESET"
 	echo -e "$RESET"
 	echo -e "$OKORANGE + -- --=[http://crowdshield.com"
-	echo -e "$OKORANGE + -- --=[sn1per v1.8 by 1N3"
+	echo -e "$OKORANGE + -- --=[sn1per v1.9 by 1N3"
 	echo -e "$OKRED " 	
 	echo -e "$OKRED     ./\."
 	echo -e "$OKRED   ./    '\."
@@ -253,6 +268,21 @@ if [ "$MODE" = "stealth" ]; then
 	cutycapt --url=https://$TARGET --out=loot/$TARGET-port443.jpg
 	echo -e "$OKRED[+]$RESET Screenshot saved to $PWD/loot/$TARGET-port443.jpg"
 	echo -e "$OKGREEN + -- ----------------------------=[Done]=------------------------------------ -- +$RESET"
+	cd $PWD/loot/
+	echo -e "$OKORANGE + -- --=[Sorting loot directory ($PWD)"
+	mkdir reports/ -p 2> /dev/null
+	echo -e "$OKORANGE + -- --=[Generating reports..."
+	for a in `ls sniper-*.txt 2>/dev/null`; do echo "$a" >> reports/$a && sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" $a > reports/$a; done
+	mv $PWD/report-* $PWD/reports/ 2> /dev/null
+	mkdir $PWD/screenshots/ -p 2> /dev/null
+	mv $PWD/*.jpg $PWD/screenshots/ 2> /dev/null
+	mkdir $PWD/nmap -p 2> /dev/null
+	mv $PWD/*.xml $PWD/nmap/ 2> /dev/null
+	mkdir $PWD/domains -p 2> /dev/null
+	mv $PWD/domains-* $PWD/domains/ 2> /dev/null
+	mkdir $PWD/output -p 2> /dev/null
+	mv $PWD/sniper-* $PWD/output 2> /dev/null
+	rm -f $PWD/.fuse_* 2> /dev/null
 	exit
 fi
 
@@ -269,7 +299,7 @@ if [ "$MODE" = "airstrike" ]; then
 	echo -e "$OKRED               /_/                 $RESET"
 	echo -e "$RESET"
 	echo -e "$OKORANGE + -- --=[http://crowdshield.com"
-	echo -e "$OKORANGE + -- --=[sn1per v1.8 by 1N3"
+	echo -e "$OKORANGE + -- --=[sn1per v1.9 by 1N3"
 
 	for a in `cat $TARGET`;
 	do
@@ -350,6 +380,21 @@ if [ "$MODE" = "airstrike" ]; then
 		cutycapt --url=https://$a --out=loot/$a-port443.jpg
 		echo -e "$OKRED[+]$RESET Screenshot saved to $PWD/loot/$a-port443.jpg"
 		echo -e "$OKGREEN + -- ----------------------------=[Done!]=----------------------------------- -- +$RESET"
+		cd $PWD/loot/
+		echo -e "$OKORANGE + -- --=[Sorting loot directory ($PWD)"
+		mkdir reports/ -p 2> /dev/null
+		echo -e "$OKORANGE + -- --=[Generating reports..."
+		for a in `ls sniper-*.txt 2>/dev/null`; do echo "$a" >> reports/$a && sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" $a > reports/$a; done
+		mv $PWD/report-* $PWD/reports/ 2> /dev/null
+		mkdir $PWD/screenshots/ -p 2> /dev/null
+		mv $PWD/*.jpg $PWD/screenshots/ 2> /dev/null
+		mkdir $PWD/nmap -p 2> /dev/null
+		mv $PWD/*.xml $PWD/nmap/ 2> /dev/null
+		mkdir $PWD/domains -p 2> /dev/null
+		mv $PWD/domains-* $PWD/domains/ 2> /dev/null
+		mkdir $PWD/output -p 2> /dev/null
+		mv $PWD/sniper-* $PWD/output 2> /dev/null
+		rm -f $PWD/.fuse_* 2> /dev/null
 		echo -e ""
 		echo -e ""
 		echo -e ""
@@ -425,7 +470,7 @@ echo -e "$OKRED /____/_/ /_/___/ .___/\___/_/     $RESET"
 echo -e "$OKRED               /_/                 $RESET"
 echo -e "$RESET"
 echo -e "$OKORANGE + -- --=[http://crowdshield.com"
-echo -e "$OKORANGE + -- --=[sn1per v1.8 by 1N3"
+echo -e "$OKORANGE + -- --=[sn1per v1.9 by 1N3"
 echo -e "$RESET"
 echo -e "$OKGREEN + -- ----------------------------=[Running Nslookup]=------------------------ -- +$RESET"
 nslookup $TARGET
@@ -491,6 +536,7 @@ port_512=`grep 'portid="512"' $LOOT_DIR/nmap-$TARGET.xml | grep open`
 port_513=`grep 'portid="513"' $LOOT_DIR/nmap-$TARGET.xml | grep open`
 port_514=`grep 'portid="514"' $LOOT_DIR/nmap-$TARGET.xml | grep open`
 port_1099=`grep 'portid="1099"' $LOOT_DIR/nmap-$TARGET.xml | grep open`
+port_1433=`grep 'portid="1099"' $LOOT_DIR/nmap-$TARGET.xml | grep open`
 port_1524=`grep 'portid="1524"' $LOOT_DIR/nmap-$TARGET.xml | grep open`
 port_2049=`grep 'portid="2049"' $LOOT_DIR/nmap-$TARGET.xml | grep open`
 port_2121=`grep 'portid="2121"' $LOOT_DIR/nmap-$TARGET.xml | grep open`
@@ -892,6 +938,14 @@ else
 	amap $TARGET 514 -A
 fi
 
+if [ -z "$port_1433" ];
+then
+	echo -e "$OKRED + -- --=[Port 1433 closed... skipping.$RESET"
+else
+	echo -e "$OKORANGE + -- --=[Port 1433 opened... running tests...$RESET"
+	nmap -A -sV -T5 --script=mssql* -p 1433 $TARGET
+fi
+
 if [ -z "$port_2049" ];
 then
 	echo -e "$OKRED + -- --=[Port 2049 closed... skipping.$RESET"
@@ -1152,6 +1206,20 @@ else
 	echo ""
 	rm -f scan.log
 fi
-./sniper loot
+cd $PWD/loot/
+echo -e "$OKORANGE + -- --=[Sorting loot directory ($PWD)"
+mkdir reports/ -p 2> /dev/null
+echo -e "$OKORANGE + -- --=[Generating reports..."
+for a in `ls sniper-*.txt 2>/dev/null`; do echo "$a" >> reports/$a && sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" $a > reports/$a; done
+mv $PWD/report-* $PWD/reports/ 2> /dev/null
+mkdir $PWD/screenshots/ -p 2> /dev/null
+mv $PWD/*.jpg $PWD/screenshots/ 2> /dev/null
+mkdir $PWD/nmap -p 2> /dev/null
+mv $PWD/*.xml $PWD/nmap/ 2> /dev/null
+mkdir $PWD/domains -p 2> /dev/null
+mv $PWD/domains-* $PWD/domains/ 2> /dev/null
+mkdir $PWD/output -p 2> /dev/null
+mv $PWD/sniper-* $PWD/output 2> /dev/null
+rm -f $PWD/.fuse_* 2> /dev/null
 echo -e "$OKGREEN + -- ----------------------------=[Done]=------------------------------------ -- +$RESET"
 exit 0