diff --git a/.travis.yml b/.travis.yml
index 68d9960..76690c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 
 language: ruby
 rvm:
-  - 1.9
   - 2.0
   - 2.1
+  - 2.2
   - rbx-2
   - jruby
 
diff --git a/lib/rest-firebase.rb b/lib/rest-firebase.rb
index 5ef3741..e6d76f9 100644
--- a/lib/rest-firebase.rb
+++ b/lib/rest-firebase.rb
@@ -75,14 +75,14 @@ def onmessage event=nil, data=nil, sock=nil
     end
   end
 
-  def request env, app=app
+  def request env, a=app
     check_auth
     query = env[REQUEST_QUERY].inject({}) do |q, (k, v)|
       q[k] = Json.encode(v)
       q
     end
     super(env.merge(REQUEST_PATH => "#{env[REQUEST_PATH]}.json",
-                    REQUEST_QUERY => query), app)
+                    REQUEST_QUERY => query), a)
   end
 
   def generate_auth opts={}
diff --git a/rest-core b/rest-core
index ee3e80f..f7e949a 160000
--- a/rest-core
+++ b/rest-core
@@ -1 +1 @@
-Subproject commit ee3e80f89e56da614194814e868a885b72812a29
+Subproject commit f7e949a517f8e3e951887f99c864e1967a7e6510