diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 48f7695..fb21eef 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+0.4.2 (2015-05-18)
+    * Fix bug with expand + empty arguments (thanks @jikamens;
+      https://github.com/wolever/nose-parameterized/pull/25)
+
 0.4.1 (2015-05-17)
     * Fix bug with expand + empty docstring (thanks @jikamens;
       https://github.com/wolever/nose-parameterized/pull/24)
diff --git a/nose_parameterized/parameterized.py b/nose_parameterized/parameterized.py
index ef751ab..fbb26a1 100644
--- a/nose_parameterized/parameterized.py
+++ b/nose_parameterized/parameterized.py
@@ -132,7 +132,7 @@
             [("foo", 1), ("*args", (16, ))]
     """
     argspec = inspect.getargspec(func)
-    arg_offset = 1 if argspec.args[0] == "self" else 0
+    arg_offset = 1 if argspec.args[:1] == ["self"] else 0
 
     named_args = argspec.args[arg_offset:]
 
diff --git a/nose_parameterized/test.py b/nose_parameterized/test.py
index f055ee0..af4756e 100644
--- a/nose_parameterized/test.py
+++ b/nose_parameterized/test.py
@@ -184,6 +184,9 @@
 
 
 @parameterized([
+    ("", param(), []),
+    ("*a, **kw", param(), []),
+    ("*a, **kw", param(1, foo=42), [("*a", (1, )), ("**kw", {"foo": 42})]),
     ("foo", param(1), [("foo", 1)]),
     ("foo, *a", param(1), [("foo", 1)]),
     ("foo, *a", param(1, 9), [("foo", 1), ("*a", (9, ))]),
diff --git a/setup.py b/setup.py
index 448d119..e422fc4 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name="nose-parameterized",
-    version="0.4.1",
+    version="0.4.2",
     url="https://github.com/wolever/nose-parameterized",
     author="David Wolever",
     author_email="david@wolever.net",