diff --git a/demo/index.html b/demo/index.html
index cf60c2c..c263757 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -16,47 +16,65 @@
 		<div id="jsontotable-obj" class="jsontotable"></div>
 		<div id="jsontotable-str" class="jsontotable"></div>
 	</div>
-    <script type="text/javascript" src="../libs/js/jquery-1.10.2.min.js"></script>
-    <script type="text/javascript" src="../src/jquery.jsontotable.js"></script>
-    <script type="text/javascript">
-    $(document).ready(function() {
-        var arr = [
-			[1, 2, 3],
-			[1, 2, 3]
-		];
-		$.jsontotable(arr, { id: "#jsontotable-arr", header: false });
-
-        var obj = [
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}
-		];
-		$.jsontotable(obj, { id: "#jsontotable-obj" });
-
-        var str = '[\
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
-			{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"} \
-		]';
-		$.jsontotable(str, {
-			id: "#jsontotable-str",
-			className: "table table-hover"
+		<script type="text/javascript" src="../libs/js/jquery-1.10.2.min.js"></script>
+		<script type="text/javascript" src="../dist/jquery.jsontotable.min.js"></script>
+		<script type="text/javascript">
+		$(document).ready(function() {
+			var arr = [
+					[1, 2, 3],
+					[1, 2, 3]
+			];
+
+			$("#jsontotable-arr").append($("<h1></h1>").html("Array To Table"));
+
+			$.jsontotable(arr, { id: "#jsontotable-arr", header: true });
+
+			$("#jsontotable-arr").append($("<h1></h1>").html("Array To Table (Without Header)"));
+
+			$.jsontotable(arr, { id: "#jsontotable-arr", header: false });
+
+
+			var obj = [
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"},
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}
+			];
+
+			$("#jsontotable-obj").append($("<h1></h1>").html("JSON To Table (Has Header)"));
+
+			$.jsontotable(obj, { id: "#jsontotable-obj" });
+
+			$("#jsontotable-obj").append($("<h1></h1>").html("JSON To Table (Without Header)"));
+
+			$.jsontotable(obj, { id: "#jsontotable-obj", header: false });
+
+			var str = '[\
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"}, \
+				{"Title1": "Hello", "Title2": "Fine", "Title3": "Thank you"} \
+			]';
+
+			$("#jsontotable-obj").append($("<h1></h1>").html("JSON (String Format) To Table"));
+			
+			$.jsontotable(str, {
+				id: "#jsontotable-str",
+				className: "table table-hover"
+			});
 		});
-    });
-    </script>
+		</script>
 </body>
 </html>
diff --git a/dist/jquery.jsontotable.min.js b/dist/jquery.jsontotable.min.js
index 4f537dc..2ded362 100644
--- a/dist/jquery.jsontotable.min.js
+++ b/dist/jquery.jsontotable.min.js
@@ -1,4 +1,4 @@
-/*! jQuery JSON to Table - v1.0.1 - 2014-01-04
+/*! jQuery JSON to Table - v1.0.2 - 2014-03-17
 * https://github.com/jongha/jquery-jsontotable
 * Copyright (c) 2014 Jong-Ha Ahn; Licensed MIT */
-!function(a){a.jsontotable=function(b,c){var d=a.extend({id:null,header:!0,className:null},c);c=a.extend(d,c);var e=b;if("string"==typeof e&&(e=a.parseJSON(e)),c.id&&e.length){var f,g,h=a("<table></table>");for(c.className&&h.addClass(c.className),a.fn.appendTr=function(b,c){var d=c?"thead":"tbody",e=c?"th":"td";g=a("<tr></tr>");for(var f in b)g.append("<"+e+">"+b[f]+"</"+e+">");return a(this).append(a("<"+d+"></"+d+">").append(g)),this},c.header&&h.appendTr(e[0],!0),f=0;f<e.length;f++)h.appendTr(e[f]);a(c.id).append(h)}return this}}(jQuery);
\ No newline at end of file
+!function(a){a.jsontotable=function(b,c){var d=a.extend({id:null,header:!0,className:null},c);c=a.extend(d,c);var e=b;if("string"==typeof e&&(e=a.parseJSON(e)),c.id&&e.length){var f,g,h=a("<table></table>");for(c.className&&h.addClass(c.className),a.fn.appendTr=function(b,c){var d=c?"thead":"tbody",e=c?"th":"td";g=a("<tr></tr>");for(var f in b)"function"!=typeof b[f]&&g.append("<"+e+">"+b[f]+"</"+e+">");if(c)a(this).append(a("<"+d+"></"+d+">").append(g));else{var h=a(this).find("tbody");0===h.length&&(h=a(this).append("<tbody></tbody>")),h.append(g)}return this},c.header&&h.appendTr(e[0],!0),f=c.header?1:0;f<e.length;f++)h.appendTr(e[f],!1,f);a(c.id).append(h)}return this}}(jQuery);
\ No newline at end of file
diff --git a/src/jquery.jsontotable.js b/src/jquery.jsontotable.js
index 6bb0d5b..e159317 100644
--- a/src/jquery.jsontotable.js
+++ b/src/jquery.jsontotable.js
@@ -28,15 +28,21 @@
 
 				row = $("<tr></tr>");
 				for(var key in rowData) {
-					if(typeof rowData[key] !== "function"){ /* ADDED: this wrapper to account for people bootstrapping the ECMA Array model otherwise functions get converted to strings and show up in the object list / output */
+					if(typeof rowData[key] !== "function") { /* ADDED: this wrapper to account for people bootstrapping the ECMA Array model otherwise functions get converted to strings and show up in the object list / output */
 						row.append("<" + rowTag + ">" + rowData[key] + "</" + rowTag + ">");
 					}
 				}
 
-				if(isHeader){ /* ADDED: IF/ELSE to eliminate repetitive TBODY tags for every row */
-					$(this).append($("<" + frameTag + "></" + frameTag + ">").append(row).append("<tbody></tbody>"));
-				}else{
-					$(this).find("tbody").append(row); //always append data rows to the first tbody tag
+				if(isHeader) { /* ADDED: IF/ELSE to eliminate repetitive TBODY tags for every row */
+					$(this).append($("<" + frameTag + "></" + frameTag + ">").append(row));
+
+				}else {
+					var tbody = $(this).find("tbody");
+					if(tbody.length === 0) {
+						tbody = $(this).append("<tbody></tbody>");
+					}
+
+					tbody.append(row); //always append data rows to the first tbody tag
 				}
 
 				return this;
diff --git a/test/jquery.jsontotable_test.js b/test/jquery.jsontotable_test.js
index f7f44c8..1691b50 100644
--- a/test/jquery.jsontotable_test.js
+++ b/test/jquery.jsontotable_test.js
@@ -1,91 +1,156 @@
 (function($) {
-    test("Test1 for Array", function() {
-        var target = $("#test1");
-        var arr = [[1, 2, 3]];
-
-        target.empty();
-        $.jsontotable(arr, { id: "#test1", header: false });
-        equal(target.find("thead").length, 0);
-        equal(target.find("tbody").length, 1);
-        equal(target.find("tr").length, 1);
-        equal(target.find("td").length, 3);
-        equal(target.text(), arr[0].join(""));
-
-        arr = [[1, 2, 3], [1, 2, 3]];
-        target.empty();
-        $.jsontotable(arr, { id: "#test1", header: false });
-        equal(target.find("thead").length, 0);
-        equal(target.find("tbody").length, 2);
-        equal(target.find("tr").length, 2);
-        equal(target.find("td").length, 6);
-        equal(target.text(), arr[0].join("") + arr[1].join(""));
-
-        target.empty();
-        $.jsontotable(arr, { id: "#test1" });
-        equal(target.find("thead").length, 1);
-        equal(target.find("tbody").length, 2);
-        equal(target.find("tr").length, 3);
-        equal(target.find("td").length, 6);
-        equal(target.text(), arr[0].join("") + arr[0].join("") + arr[1].join(""));
-    });
-
-    test("Test2 for String", function() {
-        var target = $("#test2");
-        var str = "[[1, 2, 3]]";
-
-        target.empty();
-        $.jsontotable(str, { id: "#test2", header: false });
-        equal(target.find("thead").length, 0);
-        equal(target.find("tbody").length, 1);
-        equal(target.find("tr").length, 1);
-        equal(target.find("td").length, 3);
-        equal(target.text(), str.replace(/[\[\], ]/gi, ""));
-
-        str = "[[1, 2, 3], [1, 2, 3]]";
-        target.empty();
-        $.jsontotable(str, { id: "#test2", header: false });
-        equal(target.find("thead").length, 0);
-        equal(target.find("tbody").length, 2);
-        equal(target.find("tr").length, 2);
-        equal(target.find("td").length, 6);
-        equal(target.text(), str.replace(/[\[\], ]/gi, ""));
-
-        target.empty();
-        $.jsontotable(str, { id: "#test2" });
-        equal(target.find("thead").length, 1);
-        equal(target.find("tbody").length, 2);
-        equal(target.find("tr").length, 3);
-        equal(target.find("td").length, 6);
-        equal(target.find("tbody").text(), str.replace(/[\[\], ]/gi, ""));
-    });
-
-    test("Test3 for Dictionary", function() {
-        var target = $("#test3");
-        var str = '[{ "a": 1, "b": 2, "c": 3 }]';
-
-        target.empty();
-        $.jsontotable(str, { id: "#test3", header: false });
-        equal(target.find("thead").length, 0);
-        equal(target.find("tbody").length, 1);
-        equal(target.find("tr").length, 1);
-        equal(target.find("td").length, 3);
-        equal(target.text(), str.replace(/[\{\}\"\[\], abc:]/gi, ""));
-
-        str = '[{ "a": 1, "b": 2, "c": 3 }, { "a": 1, "b": 2, "c": 3 }]';
-        target.empty();
-        $.jsontotable(str, { id: "#test3", header: false });
-        equal(target.find("thead").length, 0);
-        equal(target.find("tbody").length, 2);
-        equal(target.find("tr").length, 2);
-        equal(target.find("td").length, 6);
-        equal(target.text(), str.replace(/[\{\}\"\[\], abc:]/gi, ""));
-
-        target.empty();
-        $.jsontotable(str, { id: "#test3" });
-        equal(target.find("thead").length, 1);
-        equal(target.find("tbody").length, 2);
-        equal(target.find("tr").length, 3);
-        equal(target.find("td").length, 6);
-        equal(target.find("tbody").text(), str.replace(/[\{\}\"\[\], abc:]/gi, ""));
-    });
+		test("Test1 for Array", function() {
+				var target = $("#test1");
+				var arr = [[1, 2, 3]];
+
+				target.empty();
+				$.jsontotable(arr, { id: "#test1", header: false });
+				equal(target.find("thead").length, 0);
+				equal(target.find("tbody").length, 1);
+				equal(target.find("th").length, 0);
+				equal(target.find("tr").length, 1);
+				equal(target.find("td").length, 3);
+				equal(target.text(), arr[0].join(""));
+
+				target.empty();
+				$.jsontotable(arr, { id: "#test1", header: true });
+				equal(target.find("thead").length, 1);
+				equal(target.find("tbody").length, 0);
+				equal(target.find("th").length, 3);
+				equal(target.find("tr").length, 1);
+				equal(target.find("td").length, 0);
+				equal(target.text(), arr[0].join(""));
+
+				arr = [[1, 2, 3], [1, 2, 3]];
+				target.empty();
+				$.jsontotable(arr, { id: "#test1", header: false });
+				equal(target.find("thead").length, 0);
+				equal(target.find("tbody").length, 1);
+				equal(target.find("th").length, 0);
+				equal(target.find("tr").length, 2);
+				equal(target.find("td").length, 6);
+				equal(target.text(), arr[0].join("") + arr[1].join(""));
+
+				target.empty();
+				$.jsontotable(arr, { id: "#test1", header: true });
+				equal(target.find("thead").length, 1);
+				equal(target.find("tbody").length, 1);
+				equal(target.find("th").length, 3);
+				equal(target.find("tr").length, 2);
+				equal(target.find("td").length, 3);
+				equal(target.text(), arr[0].join("") + arr[1].join(""));
+
+				target.empty();
+				$.jsontotable(arr, { id: "#test1" });
+				equal(target.find("thead").length, 1);
+				equal(target.find("tbody").length, 1);
+				equal(target.find("th").length, 3);
+				equal(target.find("tr").length, 2);
+				equal(target.find("td").length, 3);
+				equal(target.text(), arr[0].join("") + arr[1].join(""));
+		});
+
+		test("Test2 for String", function() {
+				var target = $("#test2");
+				var str = "[[1, 2, 3]]";
+
+				target.empty();
+				$.jsontotable(str, { id: "#test2", header: false });
+				equal(target.find("thead").length, 0);
+				equal(target.find("tbody").length, 1);
+				equal(target.find("th").length, 0);
+				equal(target.find("tr").length, 1);
+				equal(target.find("td").length, 3);
+				equal(target.text(), str.replace(/[\[\], ]/gi, ""));
+
+				target.empty();
+				$.jsontotable(str, { id: "#test2", header: true });
+				equal(target.find("thead").length, 1);
+				equal(target.find("tbody").length, 0);
+				equal(target.find("th").length, 3);
+				equal(target.find("tr").length, 1);
+				equal(target.find("td").length, 0);
+				equal(target.text(), str.replace(/[\[\], ]/gi, ""));
+
+
+				str = "[[1, 2, 3], [1, 2, 3]]";
+				target.empty();
+				$.jsontotable(str, { id: "#test2", header: false });
+				equal(target.find("thead").length, 0);
+				equal(target.find("tbody").length, 1);
+				equal(target.find("th").length, 0);
+				equal(target.find("tr").length, 2);
+				equal(target.find("td").length, 6);
+				equal(target.text(), str.replace(/[\[\], ]/gi, ""));
+
+				target.empty();
+				$.jsontotable(str, { id: "#test2", header: true });
+				equal(target.find("thead").length, 1);
+				equal(target.find("tbody").length, 1);
+				equal(target.find("th").length, 3);
+				equal(target.find("tr").length, 2);
+				equal(target.find("td").length, 3);
+				equal(target.text(), str.replace(/[\[\], ]/gi, ""));
+
+				target.empty();
+				$.jsontotable(str, { id: "#test2" });
+				equal(target.find("thead").length, 1);
+				equal(target.find("tbody").length, 1);
+				equal(target.find("th").length, 3);
+				equal(target.find("tr").length, 2);
+				equal(target.find("td").length, 3);
+				equal(target.text(), str.replace(/[\[\], ]/gi, ""));
+		});
+
+		test("Test3 for Dictionary", function() {
+				var target = $("#test3");
+				var str = '[{ "a": 1, "b": 2, "c": 3 }]';
+
+				target.empty();
+				$.jsontotable(str, { id: "#test3", header: false });
+				equal(target.find("thead").length, 0);
+				equal(target.find("tbody").length, 1);
+				equal(target.find("th").length, 0);
+				equal(target.find("tr").length, 1);
+				equal(target.find("td").length, 3);
+				equal(target.text(), str.replace(/[\{\}\"\[\], abc:]/gi, ""));
+
+				target.empty();
+				$.jsontotable(str, { id: "#test3", header: true });
+				equal(target.find("thead").length, 1);
+				equal(target.find("tbody").length, 0);
+				equal(target.find("th").length, 3);
+				equal(target.find("tr").length, 1);
+				equal(target.find("td").length, 0);
+				equal(target.text(), str.replace(/[\{\}\"\[\], abc:]/gi, ""));
+
+				str = '[{ "a": 1, "b": 2, "c": 3 }, { "a": 1, "b": 2, "c": 3 }]';
+
+				target.empty();
+				$.jsontotable(str, { id: "#test3", header: false });
+				equal(target.find("thead").length, 0);
+				equal(target.find("tbody").length, 1);
+				equal(target.find("th").length, 0);
+				equal(target.find("tr").length, 2);
+				equal(target.find("td").length, 6);
+				equal(target.text(), str.replace(/[\{\}\"\[\], abc:]/gi, ""));
+
+				target.empty();
+				$.jsontotable(str, { id: "#test3", header: true });
+				equal(target.find("thead").length, 1);
+				equal(target.find("tbody").length, 1);
+				equal(target.find("th").length, 3);
+				equal(target.find("tr").length, 2);
+				equal(target.find("td").length, 3);
+				equal(target.text(), str.replace(/[\{\}\"\[\], abc:]/gi, ""));
+
+				target.empty();
+				$.jsontotable(str, { id: "#test3" });
+				equal(target.find("thead").length, 1);
+				equal(target.find("tbody").length, 1);
+				equal(target.find("th").length, 3);
+				equal(target.find("tr").length, 2);
+				equal(target.find("td").length, 3);
+				equal(target.text(), str.replace(/[\{\}\"\[\], abc:]/gi, ""));
+		});
 }(jQuery));