diff --git a/editor/images/shape_group.png b/editor/images/shape_group.png
new file mode 100644
index 00000000..bb2ff516
Binary files /dev/null and b/editor/images/shape_group.png differ
diff --git a/editor/images/shape_ungroup.png b/editor/images/shape_ungroup.png
new file mode 100644
index 00000000..3a6f369a
Binary files /dev/null and b/editor/images/shape_ungroup.png differ
diff --git a/editor/svg-editor.css b/editor/svg-editor.css
index e3c41a28..9a8b99b9 100644
--- a/editor/svg-editor.css
+++ b/editor/svg-editor.css
@@ -121,6 +121,10 @@ div.color_block {
 	display: none;
 }
 
+#svg_editor #group_panel {
+	display: none;
+}
+
 #svg_editor #rect_panel {
 	display: none;
 }
diff --git a/editor/svg-editor.html b/editor/svg-editor.html
index 95600fa0..309558d8 100644
--- a/editor/svg-editor.html
+++ b/editor/svg-editor.html
@@ -87,6 +87,7 @@
 		<img class="tool_sep" src="images/sep.png" alt="|"/>
 		<img class="tool_button" id="tool_clone_multi" src="images/clone.png" title="Clone Elements [C]" alt="Clone"/>
 		<img class="tool_button" id="tool_delete_multi" src="images/delete.png" title="Delete Selected Elements [Delete/Backspace]" alt="Delete"/>
+		<img class="tool_button" id="tool_group" src="images/shape_group.png" title="Group Elements [G]" alt="Group"/>
 		<img class="tool_sep" src="images/sep.png" alt="|"/>
 		<img class="tool_button" id="tool_alignleft" src="images/align-left.png" title="Align Left" alt="Left"/>
 		<img class="tool_button" id="tool_aligncenter" src="images/align-center.png" title="Align Center" alt="Center"/>
@@ -103,6 +104,11 @@
 		</select>
 	</div>
 
+	<div id="group_panel">
+		<img class="tool_sep" src="images/sep.png" alt="|"/>
+		<img class="tool_button" id="tool_ungroup" src="images/shape_ungroup.png" title="Ungroup Elements [G]" alt="Ungroup"/>
+	</div>
+
 	<div id="rect_panel">
 		<img class="tool_sep" src="images/sep.png" alt="|"/>
 		<label class="rect_tool">x:</label>
@@ -257,7 +263,7 @@
 
 	<div id="tools_bottom_3">
 		<div id="palette_holder"><div id="palette" title="Click to change fill color, shift-click to change stroke color"></div></div>
-		<div id="copyright">Powered by <a href="http://svg-edit.googlecode.com/" target="_blank">SVG-edit v2.4-preAlpha</a></div>
+		<div id="copyright">Powered by <a href="http://svg-edit.googlecode.com/" target="_blank">SVG-edit v2.4-unstable</a></div>
 	</div>
 </div>
 
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index e2b358ed..1ae89f5a 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -556,6 +556,10 @@ function svg_edit_setup() {
 			svgCanvas.redo();
 	};
 	
+	var clickGroup = function(){
+		console.log("Group not implemented yet");
+	};
+	
 	var clickClone = function(){
 		svgCanvas.cloneSelectedElements();
 	};
@@ -657,6 +661,8 @@ function svg_edit_setup() {
 	$('#tool_redo').click(clickRedo);
 	$('#tool_clone').click(clickClone);
 	$('#tool_clone_multi').click(clickClone);
+	$('#tool_group').click(clickGroup);
+	$('#tool_ungroup').click(clickGroup);
 	$('#tool_alignleft').click(clickAlignLeft);
 	$('#tool_aligncenter').click(clickAlignCenter);
 	$('#tool_alignright').click(clickAlignRight);
@@ -741,6 +747,7 @@ function svg_edit_setup() {
 			[modKey+'y', function(evt){clickRedo();evt.preventDefault();}],
 			[modKey+'u', function(evt){showSourceEditor();evt.preventDefault();}],
 			[modKey+'c', function(evt){clickClone();evt.preventDefault();}],
+			[modKey+'g', function(evt){clickGroup();evt.preventDefault();}],
 			['esc', cancelSourceEditor, false]
 		];