diff --git a/CHANGES b/CHANGES
index 7c84292..b6afcc6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+0.3.0 (unreleased)
+------------------
+
+- No changes yet
+
 0.2.0 (2016-09-29)
 ------------------
 
diff --git a/PKG-INFO b/PKG-INFO
index ebadaa6..524f538 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,11 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
 Name: astrodendro
-Version: 0.2.0
+Version: 0.3.0.dev0
 Summary: Python package for computation of astronomical dendrograms
 Home-page: http://www.dendrograms.org
 Author: Thomas Robitaille, Chris Beaumont, Adam Ginsburg, Braden MacDonald, and Erik Rosolowsky
 Author-email: thomas.robitaille@gmail.com
 License: UNKNOWN
-Description: UNKNOWN
 Keywords: Scientific/Engineering
 Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
@@ -14,3 +13,7 @@ Classifier: Programming Language :: Python
 Classifier: License :: OSI Approved :: MIT License
 Requires: numpy
 Provides: astrodendro
+License-File: LICENSE
+
+UNKNOWN
+
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..caf778f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,31 @@
+About
+-----
+
+The aim of this module is to provide an easy way to compute dendrograms of observed or simulated Astronomical data in Python
+
+Documentation
+-------------
+
+For information on installing and using ``astrodendro``, please visit [https://dendrograms.readthedocs.io/](https://dendrograms.readthedocs.io/)
+
+Reporting issues
+----------------
+
+Please report issues via the [GitHub issue tracker](https://github.com/dendrograms/astrodendro/issues)
+
+Credits
+-------
+
+This package was developed by:
+
+* [Braden MacDonald](https://github.com/bradenmacdonald)
+* [Chris Beaumont](https://github.com/ChrisBeaumont)
+* [Thomas Robitaille](https://github.com/astrofrog)
+* [Adam Ginsburg](https://github.com/keflavich)
+* [Erik Rosolowsky](https://github.com/low-sky)
+
+Build and coverage status
+-------------------------
+
+[![Build Status](https://travis-ci.org/dendrograms/astrodendro.svg?branch=master)](https://travis-ci.org/dendrograms/astrodendro)
+[![Coverage Status](https://coveralls.io/repos/dendrograms/astrodendro/badge.svg?branch=master)](https://coveralls.io/r/dendrograms/astrodendro?branch=master)
diff --git a/astrodendro.egg-info/PKG-INFO b/astrodendro.egg-info/PKG-INFO
index ebadaa6..524f538 100644
--- a/astrodendro.egg-info/PKG-INFO
+++ b/astrodendro.egg-info/PKG-INFO
@@ -1,12 +1,11 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
 Name: astrodendro
-Version: 0.2.0
+Version: 0.3.0.dev0
 Summary: Python package for computation of astronomical dendrograms
 Home-page: http://www.dendrograms.org
 Author: Thomas Robitaille, Chris Beaumont, Adam Ginsburg, Braden MacDonald, and Erik Rosolowsky
 Author-email: thomas.robitaille@gmail.com
 License: UNKNOWN
-Description: UNKNOWN
 Keywords: Scientific/Engineering
 Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
@@ -14,3 +13,7 @@ Classifier: Programming Language :: Python
 Classifier: License :: OSI Approved :: MIT License
 Requires: numpy
 Provides: astrodendro
+License-File: LICENSE
+
+UNKNOWN
+
diff --git a/astrodendro.egg-info/SOURCES.txt b/astrodendro.egg-info/SOURCES.txt
index bede7a8..609170b 100644
--- a/astrodendro.egg-info/SOURCES.txt
+++ b/astrodendro.egg-info/SOURCES.txt
@@ -1,6 +1,7 @@
 CHANGES
 LICENSE
 MANIFEST.in
+README.md
 runtests.py
 setup.py
 astrodendro/__init__.py
@@ -57,7 +58,6 @@ docs/index.rst
 docs/installing.rst
 docs/migration.rst
 docs/plotting.rst
-docs/rtd-pip-requirements
 docs/scatter_screenshot.png
 docs/scatter_selected_viewer_screenshot.png
 docs/schematic_structure_1.png
diff --git a/astrodendro/__init__.py b/astrodendro/__init__.py
index 1ba79b6..ea2c5e8 100644
--- a/astrodendro/__init__.py
+++ b/astrodendro/__init__.py
@@ -6,4 +6,4 @@ from .analysis import ppv_catalog, pp_catalog
 from .plot import DendrogramPlotter
 from .viewer import BasicDendrogramViewer
 
-__version__ = '0.2.0'
+__version__ = '0.3.0.dev'
diff --git a/astrodendro/dendrogram.py b/astrodendro/dendrogram.py
index 1224793..72cfeeb 100644
--- a/astrodendro/dendrogram.py
+++ b/astrodendro/dendrogram.py
@@ -5,7 +5,12 @@
 # - An ancestor is the largest structure that a structure is part of
 
 import numpy as np
-from collections import Iterable
+try:
+    # Python <= 3.9
+    from collections import Iterable
+except ImportError:
+    # Python > 3.9
+    from collections.abc import Iterable
 import copy
 import warnings
 
@@ -719,8 +724,8 @@ def periodic_neighbours(axes):
         Which axes of the data are periodic
 
 
-    Example
-    -------
+    Examples
+    --------
     Build a dendrogram where the 0th axis wraps from top-to-bottom::
 
         Dendrogram.compute(data, neighbours=periodic_neighbours(0))
@@ -847,4 +852,4 @@ def _make_trunk(dendrogram, keep_structures, is_independent):
     # To make the structure.level property fast, we ensure all the structures in the
     # trunk have their level cached as "0"
     for structure in dendrogram.trunk:
-        structure._level = 0  # See the definition of level() in structure.py
\ No newline at end of file
+        structure._level = 0  # See the definition of level() in structure.py
diff --git a/astrodendro/plot.py b/astrodendro/plot.py
index 83de7dd..b00124c 100644
--- a/astrodendro/plot.py
+++ b/astrodendro/plot.py
@@ -190,9 +190,11 @@ class DendrogramPlotter(object):
         # Case 2: one structure is selected, and subtree is True
         else:
             if subtree:
+                if isinstance(structures, int):
+                    structures = [structures]
                 if type(structures[0]) is int:
                     structure = self.dendrogram[structures[0]]
-                else: 
+                else:
                     structure = structures[0]
                 structures = structure.descendants + [structure]
         # Case 3: subtree is False (do nothing special to `structures`)
diff --git a/astrodendro/tests/benchmark_data/2d.fits b/astrodendro/tests/benchmark_data/2d.fits
new file mode 100644
index 0000000..3967ae4
Binary files /dev/null and b/astrodendro/tests/benchmark_data/2d.fits differ
diff --git a/astrodendro/tests/benchmark_data/2d1.fits b/astrodendro/tests/benchmark_data/2d1.fits
new file mode 100644
index 0000000..d365116
Binary files /dev/null and b/astrodendro/tests/benchmark_data/2d1.fits differ
diff --git a/astrodendro/tests/benchmark_data/2d2.fits b/astrodendro/tests/benchmark_data/2d2.fits
new file mode 100644
index 0000000..e79e3aa
Binary files /dev/null and b/astrodendro/tests/benchmark_data/2d2.fits differ
diff --git a/astrodendro/tests/benchmark_data/2d3.fits b/astrodendro/tests/benchmark_data/2d3.fits
new file mode 100644
index 0000000..a9593d6
Binary files /dev/null and b/astrodendro/tests/benchmark_data/2d3.fits differ
diff --git a/astrodendro/tests/benchmark_data/3d.fits b/astrodendro/tests/benchmark_data/3d.fits
new file mode 100644
index 0000000..1527db3
Binary files /dev/null and b/astrodendro/tests/benchmark_data/3d.fits differ
diff --git a/astrodendro/tests/benchmark_data/3d1.fits b/astrodendro/tests/benchmark_data/3d1.fits
new file mode 100644
index 0000000..923939f
Binary files /dev/null and b/astrodendro/tests/benchmark_data/3d1.fits differ
diff --git a/astrodendro/tests/benchmark_data/3d2.fits b/astrodendro/tests/benchmark_data/3d2.fits
new file mode 100644
index 0000000..9aaf59b
Binary files /dev/null and b/astrodendro/tests/benchmark_data/3d2.fits differ
diff --git a/astrodendro/tests/benchmark_data/3d3.fits b/astrodendro/tests/benchmark_data/3d3.fits
new file mode 100644
index 0000000..6067351
Binary files /dev/null and b/astrodendro/tests/benchmark_data/3d3.fits differ
diff --git a/astrodendro/tests/sample-data-hl.npz b/astrodendro/tests/sample-data-hl.npz
new file mode 100644
index 0000000..798738b
Binary files /dev/null and b/astrodendro/tests/sample-data-hl.npz differ
diff --git a/docs/L1551_scuba_850mu.fits b/docs/L1551_scuba_850mu.fits
new file mode 100644
index 0000000..74205d9
Binary files /dev/null and b/docs/L1551_scuba_850mu.fits differ
diff --git a/docs/PerA_Extn2MASS_F_Gal.fits b/docs/PerA_Extn2MASS_F_Gal.fits
new file mode 100644
index 0000000..094e74b
Binary files /dev/null and b/docs/PerA_Extn2MASS_F_Gal.fits differ
diff --git a/docs/conf.py b/docs/conf.py
index c7e36ce..6ed715f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -28,8 +28,8 @@ import sys, os
 extensions = ['matplotlib.sphinxext.plot_directive',
               'sphinx.ext.autodoc',
               'sphinx.ext.intersphinx',
-              'astropy.sphinx.ext.numpydoc',
-              'astropy.sphinx.ext.astropyautosummary'
+              'astropy_helpers.sphinx.ext.numpydoc',
+              'astropy_helpers.sphinx.ext.astropyautosummary'
              ]
 
 autosummary_generate = True
@@ -87,9 +87,9 @@ copyright = u'2013, Thomas Robitaille, Chris Beaumont, Braden McDonald, and Erik
 # built documents.
 #
 # The short X.Y version.
-version = '0.0'
+version = '0.3.0.dev'
 # The full version, including alpha/beta/rc tags.
-release = '0.0.0'
+release = '0.3.0.dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -287,5 +287,5 @@ intersphinx_mapping = {
     'python': ('http://docs.python.org/', None),
     'numpy': ('http://docs.scipy.org/doc/numpy/', None),
     'matplotlib': ('http://matplotlib.sourceforge.net/', None),
-    'astropy': ('http://www.astropy.org/', None),
+    'astropy': ('http://docs.astropy.org/', None),
     }
diff --git a/docs/rtd-pip-requirements b/docs/rtd-pip-requirements
deleted file mode 100644
index 59cfb81..0000000
--- a/docs/rtd-pip-requirements
+++ /dev/null
@@ -1,4 +0,0 @@
-numpy
-matplotlib
-astropy
-aplpy
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/setup.py b/setup.py
index 670f94b..599d326 100755
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@ class DendroTest(Command):
 
 
 setup(name='astrodendro',
-      version='0.2.0',
+      version='0.3.0.dev',
       url='http://www.dendrograms.org',
       description='Python package for computation of astronomical dendrograms',
       author='Thomas Robitaille, Chris Beaumont, Adam Ginsburg, Braden MacDonald, and Erik Rosolowsky',