diff --git a/.travis.yml b/.travis.yml
index c5c56b434..a550188d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ before_script:
 - "make package"
 - node test/server/file-server.js &
 - sleep 3
-- "./build/sitespeed.io -u http://127.0.0.1:8080/ -o img"
+- "./build/sitespeed.io -u http://127.0.0.1:8080/ -o img-csv"
 - "./build/sitespeed-junit.io -o build"
 
 script: ./test/test.sh
diff --git a/Makefile b/Makefile
index ed98f015c..18b7c9c04 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,7 @@ package:
 	@cp $(REPORT)/$(VELOCITY)/macros.vm $(BUILD)/$(REPORT)/$(VELOCITY)/
 	@cp $(REPORT)/$(VELOCITY)/date.macros.vm $(BUILD)/$(REPORT)/$(VELOCITY)/
 	@cp $(REPORT)/$(VELOCITY)/pages.vm $(BUILD)/$(REPORT)/$(VELOCITY)/
+	@cp $(REPORT)/$(VELOCITY)/pages-csv.vm $(BUILD)/$(REPORT)/$(VELOCITY)/
 	@cp $(REPORT)/$(VELOCITY)/summary.vm $(BUILD)/$(REPORT)/$(VELOCITY)/
 	@cp $(REPORT)/$(VELOCITY)/header.vm $(BUILD)/$(REPORT)/$(VELOCITY)/
 	@cp $(REPORT)/$(VELOCITY)/page.vm $(BUILD)/$(REPORT)/$(VELOCITY)/
diff --git a/sitespeed.io b/sitespeed.io
index 86bf8f5a2..d1d79fa12 100755
--- a/sitespeed.io
+++ b/sitespeed.io
@@ -55,7 +55,7 @@ OPTIONS:
    -s      Skip urls that contains this in the path [optional]
    -p      The number of processes that will analyze pages, default is 5 [optional]
    -m      The memory heap size for the java applications, default is 1024 Mb [optional]
-   -o      The output format, always output as html but you can add images (img) [optional]
+   -o      The output format, always output as html but you can add images and a csv file for the detailed site summary page  (img|csv) [optional]
    -r      The result base directory, default is sitespeed-result [optional]
    -z      Create a tar zip file of the result files, default is false [optional]
    -x      The proxy host & protocol: proxy.soulgalore.com:80 [optional] 
@@ -201,6 +201,13 @@ else
    OUTPUT_IMAGES=false
 fi  
 
+if [[ "$OUTPUT_FORMAT" == *csv* ]]
+  then 
+  OUTPUT_CSV=true
+else
+   OUTPUT_CSV=false
+fi  
+
 if [ "$PROXY_HOST" != "" ]
 then
     PROXY_PHANTOMJS="--proxy=$PROXY_HOST --proxy-type=$PROXY_TYPE"
@@ -350,6 +357,12 @@ echo 'Create the pages.html'
 $JAVA -Xmx"$JAVA_HEAP"m -Xms"$JAVA_HEAP"m -jar $DEPENDENCIES_DIR/$VELOCITY_JAR $REPORT_DATA_DIR/result.xml $VELOCITY_DIR/pages.vm $PROPERTIES_DIR/pages.properties $REPORT_DIR/pages.html || exit 1
 $JAVA -jar $DEPENDENCIES_DIR/$HTMLCOMPRESSOR_JAR --type html --compress-css --compress-js -o $REPORT_DIR/pages.html $REPORT_DIR/pages.html
 
+if $OUTPUT_CSV 
+  then
+  echo 'Create the pages.csv'
+  $JAVA -Xmx"$JAVA_HEAP"m -Xms"$JAVA_HEAP"m -jar $DEPENDENCIES_DIR/$VELOCITY_JAR $REPORT_DATA_DIR/result.xml $VELOCITY_DIR/pages-csv.vm $PROPERTIES_DIR/pages.properties $REPORT_DIR/pages.csv || exit 1
+fi
+
 echo 'Create the summary index.html'
 $JAVA -Xmx"$JAVA_HEAP"m -Xms"$JAVA_HEAP"m -jar $DEPENDENCIES_DIR/$VELOCITY_JAR $REPORT_DATA_DIR/summary.xml $VELOCITY_DIR/summary.vm $PROPERTIES_DIR/summary.properties $REPORT_DIR/index.html || exit 1
 $JAVA -jar $DEPENDENCIES_DIR/$HTMLCOMPRESSOR_JAR --type html --compress-css --compress-js -o $REPORT_DIR/index.html $REPORT_DIR/index.html
diff --git a/test/test.sh b/test/test.sh
index 6520dc82d..e1bbe0941 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -9,7 +9,7 @@ DATE_DIR=$(ls -1 ../build/sitespeed-result/$DOMAIN_DIR | head -n1);
 RESULT_DIR=$( cd ../build/sitespeed-result/$DOMAIN_DIR/$DATE_DIR && pwd)
 
 
-files=( index.html errorurls.html pages.html rules.html summary-details.html pages/1.html pages/2.html pages/3.html)
+files=( index.html errorurls.html pages.html pages.csv rules.html summary-details.html pages/1.html pages/2.html pages/3.html)
 
 for i in "${files[@]}"
 do