diff --git a/.travis.yml b/.travis.yml
index e54e070..f2c8d6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,18 +5,22 @@ sudo: false
 cache:
   directories:
     - $HOME/.composer/cache
-    
+
 matrix:
   include:
     - php: 5.3
       env: DEPENDENCIES='low'
+      dist: precise
     - php: 5.3
+      dist: precise
     - php: 5.4
     - php: 5.5
     - php: 5.6
     - php: 7.0
+  allow_failures:
     - php: hhvm
 
+
 before_install:
   - composer self-update
 
@@ -27,4 +31,4 @@ install:
 
 script:
   - ./bin/phpspec run --format=pretty
-  - ./bin/phpunit 
+  - ./bin/phpunit
diff --git a/composer.json b/composer.json
index 9d0b3bc..e070d9f 100644
--- a/composer.json
+++ b/composer.json
@@ -33,11 +33,6 @@
             "Coduo\\PHPHumanizer\\Tests\\": "tests/"
         }
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    },
     "suggest": {
         "ext-intl": "Required if you are going to use humanizer with different locales than en_EN"
     }
diff --git a/src/Coduo/PHPHumanizer/Resources/translations/difference.zh_TW.yml b/src/Coduo/PHPHumanizer/Resources/translations/difference.zh_TW.yml
new file mode 100644
index 0000000..5be5bb9
--- /dev/null
+++ b/src/Coduo/PHPHumanizer/Resources/translations/difference.zh_TW.yml
@@ -0,0 +1,35 @@
+just_now:
+  past: "[0,Inf] 剛剛"
+  future: "[0,Inf] 剛剛"
+second:
+  past: "[1,Inf] %count% 秒前"
+  future: "[1,Inf] %count% 秒後"
+minute:
+  past: "[1,Inf] %count% 分鐘前"
+  future: "[1,Inf] %count% 分鐘後"
+hour:
+  past: "[1,Inf] %count% 小時前"
+  future: "[1,Inf] %count% 小時後"
+day:
+  past: "[1,Inf] %count% 天前"
+  future: "[1,Inf] %count% 天後"
+week:
+  past: "[1,Inf] %count% 週前"
+  future: "[1,Inf] %count% 週後"
+month:
+  past: "[1,Inf] %count% 個月前"
+  future: "[1,Inf] %count% 個月後"
+year:
+  past: "[1,Inf] %count% 年前"
+  future: "[1,Inf] %count% 年後"
+
+compound:
+  second: "[1,Inf] %count% 秒"
+  minute: "[1,Inf] %count% 分鐘"
+  hour: "[1,Inf] %count% 小時"
+  day: "[1,Inf] %count% 天"
+  week: "[1,Inf] %count% 週"
+  month: "[1,Inf] %count% 個月"
+  year: "[1,Inf] %count% 年"
+  past: "%value%前"
+  future: "%value%後"
diff --git a/src/Coduo/PHPHumanizer/Resources/translations/oxford.zh_TW.yml b/src/Coduo/PHPHumanizer/Resources/translations/oxford.zh_TW.yml
new file mode 100644
index 0000000..61dc201
--- /dev/null
+++ b/src/Coduo/PHPHumanizer/Resources/translations/oxford.zh_TW.yml
@@ -0,0 +1,3 @@
+only_two: "%first% 和 %second%"
+comma_separated: "%list%, 和 %last%"
+comma_separated_with_limit: "{1} %list% 和另一個|[2,Inf] %list% 和另 %count% 個"