diff --git a/.gitignore b/.gitignore
index e993a91..68d6eaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
+.pytest_cache/
 
 # C extensions
 *.so
diff --git a/pyModeS/decoder/ehs.py b/pyModeS/decoder/ehs.py
index d648ea6..55da8f6 100644
--- a/pyModeS/decoder/ehs.py
+++ b/pyModeS/decoder/ehs.py
@@ -843,8 +843,13 @@ def isBDS60(msg):
     if mach is not None and mach > 1:
         result &= False
 
-    # leave out the check from vertical rates,
-    #   due to very noisy measurement
+    vr_baro = vr60baro(msg)
+    if vr_baro is not None and abs(vr_baro) > 6000:
+        result &= False
+
+    vr_ins = vr60ins(msg)
+    if vr_ins is not None and abs(vr_ins) > 6000:
+        result &= False
 
     return result
 
@@ -973,7 +978,7 @@ def BDS(msg):
         msg (String): 28 bytes hexadecimal message string
 
     Returns:
-        String or None: Version: "BDS20", "BDS40", "BDS50", or "BDS60". Or None, if nothing matched
+        String or None: BDS version, or possible versions, or None if nothing matches.
     """
 
     if isnull(msg):
@@ -996,4 +1001,5 @@ def BDS(msg):
     elif sum(isBDS) == 1:
         return BDS[isBDS.index(True)]
     else:
-        return [bds for (bds, i) in zip(BDS, isBDS) if i]
+        bds_ = [bds for (bds, i) in zip(BDS, isBDS) if i]
+        return ','.join(bds_)
diff --git a/setup.py b/setup.py
index 08a5025..af6289c 100644
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ setup(
     # your project is installed. For an analysis of "install_requires" vs pip's
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=[''],
+    install_requires=['numpy'],
 
     # List additional groups of dependencies here (e.g. development
     # dependencies). You can install these using the following syntax,
diff --git a/tox.ini b/tox.ini
index ed3f701..66cae0a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,9 @@
 [tox]
-toxworkdir=/tmp/tox
+toxworkdir = /tmp/tox
 envlist = py2,py3
+
 [testenv]
-deps=pytest
-commands=py.test
+deps =
+  pytest
+  numpy
+commands = py.test