diff --git a/deepdream/make_json.sh b/deepdream/make_json.sh
index 0a3011c..c5fee78 100755
--- a/deepdream/make_json.sh
+++ b/deepdream/make_json.sh
@@ -25,8 +25,8 @@ counter=1
 find . -type f -not -path '*/\.*' -print0 | while read -d $'\0' f;
 do
     id=$counter
-    name=`basename $f`
-    src="/outputs/$name"
+    name="$( basename "$f" )"
+    src="/outputs/$f"
     echo -n "{\"id\":\"$id\",\"name\":\"$name\",\"src\":\"$src\"}" >> ../temp.json
     if [ "$id" != "$nfiles" ]; then
 	echo -n "," >> ../temp.json
diff --git a/deepdream/process_images_once.sh b/deepdream/process_images_once.sh
index 29d5724..37ff16a 100755
--- a/deepdream/process_images_once.sh
+++ b/deepdream/process_images_once.sh
@@ -4,23 +4,23 @@
 # Copyright vision.ai, 2015
 
 cd /opt/deepdream/inputs
-find . -type f -not -path '*/\.*' -print0 | while read -d $'\0' f;
-do
-    cd /opt/deepdream
-    if [ -e outputs/${f} ];
-    then
-	echo "File ${f} already processed"
+find . -type f -not -path '*/\.*' -print0 | while read -d $'\0' f; do
+    if [[ "$(basename $(pwd))" == *'inputs'* ]]; then
+        cd /opt/deepdream
+    fi
+    if [ -e "outputs/${f}" ]; then
+        echo "File ${f} already processed"
     else
-	echo "Deepdream" ${f}
-	chmod gou+r inputs/${f}
-	cp inputs/${f} input.jpg
-	python deepdream.py
-	ERROR_CODE=$?
-	echo "Error Code is" ${ERROR_CODE}
-	cp output.jpg outputs/${f}
-	rm output.jpg
-	echo "Just created" outputs/${f}
+        echo "Deepdream  ${f}"
+        chmod gou+r "inputs/${f}"
+        cp "inputs/${f}" input.jpg
+        python deepdream.py
+        ERROR_CODE=$?
+        echo -e "Error Code is: ${ERROR_CODE}\n\n"
+        dirname_f="$(dirname "$f")"
+        [[ -d "inputs/$dirname_f" && "$dirname_f" != '.' && "$dirname_f" != *'/deepdream/'* && ! -d "outputs/$dirname_f" ]] && mkdir -p "outputs/${dirname_f}"
+        cp output.jpg "outputs/${f}"
+        rm output.jpg
+        echo "Just created outputs/${f}"
     fi
 done
-
-