--- a/macros.xml	Thu Dec 08 06:27:47 2016 -0500
+++ b/macros.xml	Wed Aug 30 04:49:00 2017 -0400
@@ -1,8 +1,8 @@
 <macros>
-    <token name="@WRAPPER_VERSION@">1.0.1</token>
+    <token name="@WRAPPER_VERSION@">1.1.1</token>
     <xml name="requirements">
         <requirements>
-            <requirement type="package" version="1.0.1">picrust</requirement>
+            <requirement type="package" version="1.1.1">picrust</requirement>
         </requirements>
     </xml>
 
@@ -31,8 +31,15 @@
 
     <xml name="biom_format_select">
         <param name="output_type" type="select" label="Format of the output BIOM file">
-            <option value="json" selected="true">JSON</option>
-            <option value="hdf5">HDF5</option>
+            <option value="hdf5" selected="true">HDF5</option>
+            <option value="json">JSON</option>
+            <option value="tsv">Classic (tab-separated text)</option>
+        </param>
+    </xml>
+
+    <xml name="biom_format_select_no_json">
+        <param name="output_type" type="select" label="Format of the output BIOM file">
+            <option value="hdf5" selected="true">HDF5</option>
             <option value="tsv">Classic (tab-separated text)</option>
         </param>
     </xml>
@@ -40,20 +47,20 @@
     <xml name="biom_output">
         <data name="out_biom" format="tabular" label="${tool.name} on ${on_string}: Normalized OTUs">
             <change_format>
-                <when input="output_type" value="json" format="json"/>
+                <when input="output_type" value="json" format="biom1"/>
                 <when input="output_type" value="tsv" format="tabular"/>
-                <when input="output_type" value="hdf5" format="hdf5"/>
+                <when input="output_type" value="hdf5" format="h5"/>
             </change_format>
         </data>
     </xml>
 
     <token name="@OUTPUT_CONVERSION_COMMANDS@"><![CDATA[
-        #if $output_type == "json":
-            && biom convert -i tempbiom -o '$out_biom' --to-json
+        #if $output_type == "hdf5":
+            && mv tempbiom '$out_biom'
         #elif $output_type == "tsv":
             && biom convert -i tempbiom -o '$out_biom' --to-tsv
-        #else
-            && biom convert -i tempbiom -o '$out_biom' --to-hdf5
+        #else:
+            && biom convert -i tempbiom -o '$out_biom' --to-json
         #end if
     ]]></token>
 
@@ -69,13 +76,13 @@
 
 For more information please visit:
 
-- Picrust Documentation: https://picrust.github.io/picrust/
-- Picrust GitHub: http://picrust.github.com/
-- Picrust Support: https://groups.google.com/d/forum/picrust-users
+- PICRUSt Documentation: https://picrust.github.io/picrust/
+- PICRUSt GitHub: http://picrust.github.com/
+- PICRUSt Support: https://groups.google.com/d/forum/picrust-users
 
 **Reference Data**
 
-Precalculated files: ftp://ftp.microbio.me/pub/picrust-references/picrust-1.0.0/
+Precalculated files: http://kronos.pharmacology.dal.ca/public_files/picrust/picrust_precalculated_v1.1.1/13_5/
 
 ]]>
     </token>