diff --git a/.travis.yml b/.travis.yml
index d8ad4419..362177a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ sudo: false
 
 language: php
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6
diff --git a/src/Klein/DataCollection/DataCollection.php b/src/Klein/DataCollection/DataCollection.php
index aac0125e..bb08c7ff 100644
--- a/src/Klein/DataCollection/DataCollection.php
+++ b/src/Klein/DataCollection/DataCollection.php
@@ -71,6 +71,12 @@ public function keys($mask = null, $fill_with_nulls = true)
             // Support a more "magical" call
             if (!is_array($mask)) {
                 $mask = func_get_args();
+                $arglen=count($mask);
+                if($mask[$arglen-1]===false || $mask[$arglen-1]===true)
+                  {
+                    $fill_with_nulls=$mask[$arglen-1];
+                    array_pop($mask);
+                  }
             }
 
             /*
@@ -113,6 +119,12 @@ public function all($mask = null, $fill_with_nulls = true)
             // Support a more "magical" call
             if (!is_array($mask)) {
                 $mask = func_get_args();
+                $arglen=count($mask);
+                if($mask[$arglen-1]===false || $mask[$arglen-1]===true)
+                  {
+                    $fill_with_nulls=$mask[$arglen-1];
+                    array_pop($mask);
+                  }
             }
 
             /*