diff --git a/bin/epayco b/bin/epayco
old mode 100644
new mode 100755
diff --git a/lib/epayco.rb b/lib/epayco.rb
index a6b71cb..c90abff 100644
--- a/lib/epayco.rb
+++ b/lib/epayco.rb
@@ -13,6 +13,8 @@ class Error < StandardError
     include Enumerable
     attr_accessor :errors
 
+    DEFAULT_TIMEOUT = 60
+
     # Get code, lang and show custom error
     def initialize code, lang
       file = open("https://s3-us-west-2.amazonaws.com/epayco/message_api/errors.json").read
@@ -32,7 +34,7 @@ def each
 
   # Init sdk parameters
   class << self
-     attr_accessor :apiKey, :privateKey, :lang, :test
+    attr_accessor :apiKey, :privateKey, :lang, :test, :timeout
   end
 
   # Eject request and show response or error
@@ -70,11 +72,12 @@ def self.request(method, url, extra=nil, params={}, headers={}, switch)
     }.merge(headers)
     headers.delete :params unless method == :get
     options = {
-      :headers => headers,
-      :user => apiKey,
-      :method => method,
-      :url => url,
-      :payload => payload
+      headers: headers,
+      user: apiKey,
+      method: method,
+      url: url,
+      payload: payload,
+      timeout: timeout.presence || DEFAULT_TIMEOUT
     }
 
     # Open library rest client
@@ -132,7 +135,11 @@ def self.encrypt(str, key)
     cipher.encrypt
     iv = "0000000000000000"
     cipher.iv = iv
-    cipher.key = key
+    # For now we must slice the 16 bits manually, hopefully in the near future
+    # Epayco will support 32 bits encryption using another cipher, this encryption
+    # is used by both bank and cash payments
+    # cipher.key = key
+    cipher.key = key.byteslice(0, cipher.key_len)
     str = iv + str
     data = cipher.update(str) + cipher.final
     Base64.urlsafe_encode64(data)
@@ -144,5 +151,4 @@ def self.lang_key key
     data_hash = JSON.parse(file)
     data_hash[key]
   end
-
 end