diff --git a/docs/wrapping.rst b/docs/wrapping.rst
index dd9a39f..6ce6411 100644
--- a/docs/wrapping.rst
+++ b/docs/wrapping.rst
@@ -246,3 +246,12 @@ In the decorator format:
     ... def pendulum_period(length):
     ...     return 2*math.pi*math.sqrt(length/G)
 
+If you just want to check the dimensionality of a quantity, you can do so with the built-in 'check' function.
+
+.. doctest::
+
+    >>> distance = 1 * ureg.m
+    >>> distance.check('[length]')
+    True
+    >>> distance.check('[time]')
+    False
diff --git a/pint/quantity.py b/pint/quantity.py
index 88bfdac..ef25509 100644
--- a/pint/quantity.py
+++ b/pint/quantity.py
@@ -294,6 +294,11 @@ class _Quantity(PrettyIPython, SharedRegistryObject):
 
         return self._dimensionality
 
+    def check(self, dimension):
+        """Return true if the quantity's dimension matches passed dimension.
+        """
+        return self.dimensionality == dimension
+
     @classmethod
     def from_tuple(cls, tup):
         return cls(tup[0], UnitsContainer(tup[1]))
diff --git a/pint/registry_helpers.py b/pint/registry_helpers.py
index 4a8b862..5ac0dbd 100644
--- a/pint/registry_helpers.py
+++ b/pint/registry_helpers.py
@@ -130,6 +130,20 @@ def _parse_wrap_args(args, registry=None):
 
     return _converter
 
+def _apply_defaults(func, args, kwargs):
+    """Apply default keyword arguments.
+
+    Named keywords may have been left blank. This function applies the default
+    values so that every argument is defined.
+    """
+
+    sig = signature(func)
+    bound_arguments = sig.bind(*args)
+    for param in sig.parameters.values():
+        if param.name not in bound_arguments.arguments:
+            bound_arguments.arguments[param.name] = param.default
+    args = [bound_arguments.arguments[key] for key in sig.parameters.keys()]
+    return args, {} 
 
 def wraps(ureg, ret, args, strict=True):
     """Wraps a function to become pint-aware.
@@ -171,18 +185,7 @@ def wraps(ureg, ret, args, strict=True):
         @functools.wraps(func, assigned=assigned, updated=updated)
         def wrapper(*values, **kw):
 
-
-            # Named keywords may have been left blank. Wherever the named keyword is blank,
-            # fill it in with the default value.
-            sig = signature(func)
-            bound_arguments = sig.bind(*values, **kw)
-
-            for param in sig.parameters.values():
-                if param.name not in bound_arguments.arguments:
-                    bound_arguments.arguments[param.name] = param.default
-
-            values = [bound_arguments.arguments[key] for key in sig.parameters.keys()]
-            kw = {}
+            values, kw = _apply_defaults(func, values, kw)
                 
             # In principle, the values are used as is
             # When then extract the magnitudes when needed.
@@ -228,13 +231,17 @@ def check(ureg, *args):
 
         @functools.wraps(func, assigned=assigned, updated=updated)
         def wrapper(*values, **kwargs):
-            for dim, value in zip_longest(dimensions, values):
+            values, kwargs = _apply_defaults(func, values, kwargs)
+            if len(dimensions) > len(values):
+                raise TypeError("%s takes %i parameters, but %i dimensions were passed"
+                % (func.__name__, len(values), len(dimensions)))
+            for dim, value in zip(dimensions, values):
 
                 if dim is None:
                     continue
 
-                val_dim = ureg.get_dimensionality(value)
-                if val_dim != dim:
+                if not ureg.Quantity(value).check(dim):
+                    val_dim = ureg.get_dimensionality(value)
                     raise DimensionalityError(value, 'a quantity of',
                                               val_dim, dim)
             return func(*values, **kwargs)

diff --git a/pint/testsuite/test_issues.py b/pint/testsuite/test_issues.py
index 0cefce9..4dbcb98 100644
--- a/pint/testsuite/test_issues.py
+++ b/pint/testsuite/test_issues.py
@@ -625,3 +625,38 @@ class TestIssuesNP(QuantityTestCase):
 
         d2 = get_displacement(Q_(2, 's'), Q_(1, 'deg/s'))
         self.assertAlmostEqual(d2, Q_(2,' deg'))
+
+    def test_issue655a(self):
+        ureg = UnitRegistry()
+        distance = 1 * ureg.m
+        time = 1 * ureg.s
+        velocity = distance / time
+        self.assertEqual(distance.check('[length]'), True)
+        self.assertEqual(distance.check('[time]'), False)
+        self.assertEqual(velocity.check('[length] / [time]'), True)
+        self.assertEqual(velocity.check('1 / [time] * [length]'), True)
+
+    def test_issue(self):
+        import math
+        try:
+            from inspect import signature
+        except ImportError:
+            # Python2 does not have the inspect library. Import the backport
+            from funcsigs import signature
+
+        ureg = UnitRegistry()
+        Q_ = ureg.Quantity
+        @ureg.check('[length]', '[length]/[time]^2')
+        def pendulum_period(length, G=Q_(1, 'standard_gravity')):
+            print(length)
+            return (2*math.pi*(length/G)**.5).to('s')
+        l = 1 * ureg.m
+        # Assume earth gravity
+        t = pendulum_period(l)
+        self.assertAlmostEqual(t, Q_('2.0064092925890407 second'))
+        # Use moon gravity
+        moon_gravity = Q_(1.625, 'm/s^2')
+        t = pendulum_period(l, moon_gravity)
+        self.assertAlmostEqual(t, Q_('4.928936075204336 second'))
+
+
diff --git a/pint/testsuite/test_unit.py b/pint/testsuite/test_unit.py
index 0e7b17f..b9e3b06 100644
--- a/pint/testsuite/test_unit.py
+++ b/pint/testsuite/test_unit.py
@@ -437,13 +437,13 @@ class TestRegistry(QuantityTestCase):
 
         g2 = ureg.check('[speed]')(gfunc)
         self.assertRaises(DimensionalityError, g2, 3.0, 1)
-        self.assertRaises(DimensionalityError, g2, 2 * ureg.parsec)
+        self.assertRaises(TypeError, g2, 2 * ureg.parsec)
         self.assertRaises(DimensionalityError, g2, 2 * ureg.parsec, 1.0)
         self.assertEqual(g2(2.0 * ureg.km / ureg.hour, 2), 1 * ureg.km / ureg.hour)
 
         g3 = ureg.check('[speed]', '[time]', '[mass]')(gfunc)
-        self.assertRaises(DimensionalityError, g3, 1 * ureg.parsec, 1 * ureg.angstrom)
-        self.assertRaises(DimensionalityError, g3, 1 * ureg.parsec, 1 * ureg.angstrom, 1 * ureg.kilogram)
+        self.assertRaises(TypeError, g3, 1 * ureg.parsec, 1 * ureg.angstrom)
+        self.assertRaises(TypeError, g3, 1 * ureg.parsec, 1 * ureg.angstrom, 1 * ureg.kilogram)
 
     def test_to_ref_vs_to(self):
         self.ureg.autoconvert_offset_to_baseunit = True

A check function that's not a decorator
Is there a way we could implement a check function for stand-alone use, not just for wrapping functions?

```python
>>> from pint import _DEFAULT_REGISTRY
>>> ureg = _DEFAULT_REGISTRY
>>> Q_ = ureg.Quantity
>>> distance = Q_('1 meter')
>>> time = Q_('1 second')
>>> ureg.check(distance, '[length]')
True
>>> ureg.check(time, '[length]')
False
```
pint/testsuite/test_unit.py::TestRegistry::test_check pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_check
pint/testsuite/test_issues.py::TestIssues::test_alternative_angstrom_definition pint/testsuite/test_issues.py::TestIssues::test_angstrom_creation pint/testsuite/test_issues.py::TestIssues::test_issue104 pint/testsuite/test_issues.py::TestIssues::test_issue105 pint/testsuite/test_issues.py::TestIssues::test_issue121 pint/testsuite/test_issues.py::TestIssues::test_issue170 pint/testsuite/test_issues.py::TestIssues::test_issue29 pint/testsuite/test_issues.py::TestIssues::test_issue52 pint/testsuite/test_issues.py::TestIssues::test_issue523 pint/testsuite/test_issues.py::TestIssues::test_issue54 pint/testsuite/test_issues.py::TestIssues::test_issue54_related pint/testsuite/test_issues.py::TestIssues::test_issue61 pint/testsuite/test_issues.py::TestIssues::test_issue61_notNP pint/testsuite/test_issues.py::TestIssues::test_issue66 pint/testsuite/test_issues.py::TestIssues::test_issue66b pint/testsuite/test_issues.py::TestIssues::test_issue69 pint/testsuite/test_issues.py::TestIssues::test_issue85 pint/testsuite/test_issues.py::TestIssues::test_issue86 pint/testsuite/test_issues.py::TestIssues::test_issue93 pint/testsuite/test_issues.py::TestIssues::test_issues86b pint/testsuite/test_issues.py::TestIssues::test_micro_creation pint/testsuite/test_unit.py::TestUnit::test_creation pint/testsuite/test_unit.py::TestUnit::test_deepcopy pint/testsuite/test_unit.py::TestUnit::test_dimensionality pint/testsuite/test_unit.py::TestUnit::test_dimensionless pint/testsuite/test_unit.py::TestUnit::test_ipython pint/testsuite/test_unit.py::TestUnit::test_unit_casting pint/testsuite/test_unit.py::TestUnit::test_unit_cmp pint/testsuite/test_unit.py::TestUnit::test_unit_default_formatting pint/testsuite/test_unit.py::TestUnit::test_unit_div pint/testsuite/test_unit.py::TestUnit::test_unit_eqs pint/testsuite/test_unit.py::TestUnit::test_unit_formatting pint/testsuite/test_unit.py::TestUnit::test_unit_hash pint/testsuite/test_unit.py::TestUnit::test_unit_mul pint/testsuite/test_unit.py::TestUnit::test_unit_pow pint/testsuite/test_unit.py::TestUnit::test_unit_rdiv pint/testsuite/test_unit.py::TestUnit::test_unit_repr pint/testsuite/test_unit.py::TestRegistry::test_as_delta pint/testsuite/test_unit.py::TestRegistry::test_base pint/testsuite/test_unit.py::TestRegistry::test_convert_parse_str pint/testsuite/test_unit.py::TestRegistry::test_default_format pint/testsuite/test_unit.py::TestRegistry::test_define pint/testsuite/test_unit.py::TestRegistry::test_imperial_symbol pint/testsuite/test_unit.py::TestRegistry::test_load pint/testsuite/test_unit.py::TestRegistry::test_name pint/testsuite/test_unit.py::TestRegistry::test_parse_alias pint/testsuite/test_unit.py::TestRegistry::test_parse_complex pint/testsuite/test_unit.py::TestRegistry::test_parse_factor pint/testsuite/test_unit.py::TestRegistry::test_parse_mul_div pint/testsuite/test_unit.py::TestRegistry::test_parse_number pint/testsuite/test_unit.py::TestRegistry::test_parse_plural pint/testsuite/test_unit.py::TestRegistry::test_parse_prefix pint/testsuite/test_unit.py::TestRegistry::test_parse_pretty pint/testsuite/test_unit.py::TestRegistry::test_parse_single pint/testsuite/test_unit.py::TestRegistry::test_parse_units pint/testsuite/test_unit.py::TestRegistry::test_pint pint/testsuite/test_unit.py::TestRegistry::test_redefinition pint/testsuite/test_unit.py::TestRegistry::test_rep_and_parse pint/testsuite/test_unit.py::TestRegistry::test_repeated_convert pint/testsuite/test_unit.py::TestRegistry::test_singular_SI_prefix_convert pint/testsuite/test_unit.py::TestRegistry::test_str_errors pint/testsuite/test_unit.py::TestRegistry::test_symbol pint/testsuite/test_unit.py::TestRegistry::test_to_ref_vs_to pint/testsuite/test_unit.py::TestRegistry::test_wrap_referencing pint/testsuite/test_unit.py::TestRegistry::test_wraps pint/testsuite/test_unit.py::TestCompatibleUnits::test_context_sp pint/testsuite/test_unit.py::TestCompatibleUnits::test_get_base_units pint/testsuite/test_unit.py::TestCompatibleUnits::test_get_compatible_units pint/testsuite/test_unit.py::TestCompatibleUnits::test_many pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_as_delta pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_base pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_convert_parse_str pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_default_format pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_define pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_imperial_symbol pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_lazy pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_load pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_name pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_parse_alias pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_parse_complex pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_parse_factor pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_parse_mul_div pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_parse_number pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_parse_plural pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_parse_prefix pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_parse_pretty pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_parse_single pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_parse_units pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_pint pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_redefinition pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_rep_and_parse pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_repeated_convert pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_singular_SI_prefix_convert pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_str_errors pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_symbol pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_to_ref_vs_to pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_wrap_referencing pint/testsuite/test_unit.py::TestRegistryWithDefaultRegistry::test_wraps pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00001 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00002 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00003 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00004 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00005 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00006 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00007 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00008 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00009 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00010 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00011 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00012 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00013 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00014 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00015 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00016 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00017 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00018 pint/testsuite/test_unit.py::TestConvertWithOffset::test_to_and_from_offset_units_00019