--- a/montage.xml	Tue Nov 20 05:52:53 2018 -0500
+++ b/montage.xml	Tue Sep 10 09:21:23 2019 -0400
@@ -1,4 +1,4 @@
-<tool id="graphicsmagick_image_montage" name="Image Montage" version="@VERSION@">
+<tool id="graphicsmagick_image_montage" name="Image Montage" version="@VERSION@+galaxy1">
     <description></description>
     <macros>
         <import>macros.xml</import>
@@ -6,26 +6,34 @@
     <expand macro="requirements" />
     <command detect_errors="aggressive">
 <![CDATA[
-        ln -s '${input}' input_existing.jpg
-        &&
-        ln -s '${input_new}' input_new.jpg
-        &&
-        montage input_existing.jpg input_new.jpg -geometry +0+0 -background none -tile 1x2 temp.jpg
+#for idx, data in enumerate($input):
+ln -s '${data}' ${idx}.${data.ext};
+#end for
+
+montage
+
+#for idx, data in enumerate($input):
+    ${idx}.${data.ext}
+#end for
+    -geometry +0+0
+    -background none
+    -tile ${width}x
+    temp.png
 ]]>
     </command>
 
     <inputs>
-        <param format="jpg" name="input" type="data" label="Existing Image" />
-        <param format="jpg" name="input_new" type="data" label="New Image" />
+        <param format="jpg,png,bmp,gif,svg,eps,tiff" name="input" type="data" multiple="true" label="Images" />
+        <param name="width" type="integer" value="4" label="# of images wide"/>
     </inputs>
     <outputs>
-        <data format="jpg" name="output" from_work_dir="temp.jpg" />
+        <data format="png" name="output" from_work_dir="temp.png" />
     </outputs>
     <tests>
         <test>
-            <param name="input" value="donald.jpg" />
-            <param name="input_new" value="donald.jpg" />
-            <output name="output" file="result_image_montage_1.jpg" compare="sim_size" />
+            <param name="input" value="donald.jpg,donald.jpg,donald.jpg,donald.jpg,donald.jpg,donald.jpg" />
+            <param name="width" value="4" />
+            <output name="output" file="result_image_montage_1.png" compare="sim_size" />
         </test>
     </tests>
     <help>
@@ -33,9 +41,9 @@
 
 **What it does**
 
-Stick Images together
+Montage composites multiple images into a single, larger image. You may need to resize large images before you attempt to montage them.
 
-
+The width parameter controls how many images wide the montage will be. With a width of 4, and 8 images selected, you will get 2 rows of 4 images. If you have 6 images selected, the first row will have 4 images, and the second will only have two.
 ]]>
     </help>
     <expand macro="citations" />