diff --git a/.travis.yml b/.travis.yml
index d8ad4419..f522634c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,26 @@
 sudo: false
 
 language: php
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - nightly
+php:  
+  - 5.4  
+  - 5.5  
+  - 5.6  
+  - 7.0  
+  - nightly  
   - hhvm
-
-matrix:
-  allow_failures:
-    - php: nightly
-    - php: hhvm
+  
+matrix:  
+  include:    
+    - php: 5.3      
+      dist: precise  
+  allow_failures:    
+    - php: nightly    
+    - php: hhvm  
   fast_finish: true
-
-before_script:
+  
+before_script:  
   - composer install --prefer-dist
-
-script:
-  - composer validate
   - ./vendor/bin/phpunit
-  - ./vendor/bin/phpcs --standard=PSR2 --encoding=utf-8 -p src/ tests/
+  - ./vendor/bin/phpcs --standard=PSR2 --encoding=utf-8 -p src/ tests/  
+  
+  
diff --git a/src/Klein/Response.php b/src/Klein/Response.php
index 5bae3aeb..2ee847fc 100644
--- a/src/Klein/Response.php
+++ b/src/Klein/Response.php
@@ -143,14 +143,19 @@ public function file($path, $filename = null, $mimetype = null)
      *
      * @param mixed $object         The data to encode as JSON
      * @param string $jsonp_prefix  The name of the JSON-P function prefix
+     * @param bitmask $json_encode_option The bitmask options for JSON_ENCODE
      * @return Response
      */
-    public function json($object, $jsonp_prefix = null)
+    public function json($object, $jsonp_prefix = null, $json_encode_option = null)
     {
         $this->body('');
         $this->noCache();
 
-        $json = json_encode($object);
+        if ($json_encode_option != null) {
+            $json = json_encode($object, $json_encode_option);
+        } else {
+            $json = json_encode($object);
+        }
 
         if (null !== $jsonp_prefix) {
             // Should ideally be application/json-p once adopted