--- a/imagej2_make_binary.xml	Tue Aug 04 13:20:29 2015 -0400
+++ b/imagej2_make_binary.xml	Wed Aug 26 14:37:41 2015 -0400
@@ -1,38 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<tool id="imagej2_make_binary" name="Convert to binary" version="1.0.0">
+<tool id="imagej2_make_binary" name="Convert to binary" version="@WRAPPER_VERSION@.0">
     <description>(black and white) with ImageJ2</description>
     <macros>
         <import>imagej2_macros.xml</import>
     </macros>
-    <expand macro="fiji_20141125_requirements" />
+    <expand macro="fiji_requirements" />
     <command>
 <![CDATA[
     python $__tool_directory__/imagej2_make_binary.py
     --input "$input"
     --input_datatype $input.ext
     @make_binary_args@
-    @max_heap_size_args@
     --jython_script $__tool_directory__/jython_script.py
-    --output_datatype $output_datatype
+    --output_datatype $output.ext
     --output "$output"
 ]]>
     </command>
     <inputs>
         <param format="bmp,eps,gif,jpg,pcx,pgm,png,psd,tiff" name="input" type="data" label="Select image"/>
         <expand macro="make_binary_params" />
-        <param name="output_datatype" type="select" label="Save as format">
-            <expand macro="image_datatypes" />
-        </param>
-        <expand macro="max_heap_size_type_conditional" />
     </inputs>
     <outputs>
-        <data name="output" format_source="input" label="${tool.name} on ${on_string}">
-            <actions>
-                <action type="format">
-                    <option type="from_param" name="output_datatype" />
-                 </action>
-           </actions>
-       </data>
+        <data name="output" format_source="input" label="${tool.name} on ${on_string}"/>
     </outputs>
     <tests>
         <test>