diff --git a/Facades/TransmitsmsApi.php b/Facades/TransmitsmsApi.php
deleted file mode 100644
index 86964b9..0000000
--- a/Facades/TransmitsmsApi.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php namespace Abreeden\TransmitsmsApi\Facades;
- 
-use Illuminate\Support\Facades\Facade;
- 
-class TransmitsmsApi extends Facade {
- 
-  /**
-   * Get the registered name of the component.
-   *
-   * @return string
-   */
-  protected static function getFacadeAccessor() { return 'transmitsmsapi'; }
- 
-}
\ No newline at end of file
diff --git a/src/Abreeden/TransmitsmsApi/TransmitsmsApi.php b/src/Abreeden/TransmitsmsApi/TransmitsmsApi.php
deleted file mode 100644
index 81b4ea7..0000000
--- a/src/Abreeden/TransmitsmsApi/TransmitsmsApi.php
+++ /dev/null
@@ -1,542 +0,0 @@
-<?php namespace Abreeden\TransmitsmsApi;
- 
-class TransmitsmsApi 
-{
-		public static $url='https://api.transmitsms.com/';
-		
-		protected static $version=2;
-		
-		protected static $authHeader;
-		
-		protected static $responseRawData;
-		
-		protected static $responseStatus;
-		
-		public function __construct($key, $secret)
-		{
-			self::$authHeader=array('Authorization: Basic '.base64_encode($key.':'.$secret));
-		}
-		
-		protected static function generateError($code, $description)
-		{
-			$error=new stdClass();
-			$error->error->code=$code;
-			$error->error->description=$description;
-			return $error;
-		}		
-		
-		protected static function getRequestURL($method)
-		{
-			return self::$url.'/'.self::$version.'/'.$method.'.json';
-		}
-		
-		protected static function request($method, $params=array())
-		{
-			$requestUrl=self::getRequestURL($method);
-			
-			$ch = curl_init($requestUrl);
-			if (! $ch) {
-				return self::generateError('REQUEST_FAILED' ,"Error connecting to the server {$requestUrl} : ". curl_errno($ch) .':'. curl_error($ch));
-			}			
-			
-			$urlInfo = parse_url($requestUrl);
-			$port = (preg_match("/https|ssl/i", $urlInfo["scheme"])) ? 443 : 80;	
-			
-//			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-			curl_setopt($ch, CURLOPT_POST, true);
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-			curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
-			curl_setopt($ch, CURLOPT_USERAGENT, "transmitsmsAPI v.2");
-			curl_setopt($ch, CURLOPT_PORT, $port);
-			curl_setopt($ch, CURLOPT_SSLVERSION, 6);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-			curl_setopt($ch, CURLOPT_MAXREDIRS, 3);
-			curl_setopt($ch, CURLOPT_HTTPHEADER, self::$authHeader);
-			
-			self::$responseRawData = curl_exec($ch);
-			if (! self::$responseRawData) {
-				return self::generateError('REQUEST_FAILED' ,"Problem executing request, try changing above set options and re-requesting : ".curl_errno($ch) .':' .curl_error($ch));
-			}
-			self::$responseStatus=curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			return json_decode(self::$responseRawData);//, false, 512, JSON_BIGINT_AS_STRING);
-		}
-		
-		protected static function handleResponse($response)
-		{
-			if($response===null)
-				return self::generateError("INVALID_RESPONSE", "Invalid response, received data: ".self::$responseRawData);
-			//possible checks for login failure and other common mistakes	
-			return $response;
-		}
-		
-		protected static function indexCustomFields(&$params, $fields)
-		{
-			if(!count($fields))
-				return;	
-			if(isset($fields[0]))
-			{
-				// this is not an associative array, we iterate and indexify from 1 to 10
-				$fieldIndex=1;
-				foreach($fields as $field)
-				{
-					$params["field.{$fieldIndex}"]=$field;
-					$fieldIndex++;
-				}
-			}
-			else
-			{
-				// this is an associative array, we iterate and keep the indexes
-				foreach($fields as $fieldIndex=>$field)
-				{
-					$params["field.{$fieldIndex}"]=$field;
-				}				
-			}	
-		}
-		
-		protected static function prepareFieldsForEdit(&$params)
-		{
-			foreach ($params as $key=>$value) {
-				if($value===null)
-					unset($params[$key]);
-			}
-		}
-		
-		/**
-		 * Send SMS messages.
-		 * 
-		 * @param string $message 
-		 * @param string $to - required if list_id is not set
-		 * @param string $from
-		 * @param datetime $send_at
-		 * @param int $list_id - required if to is not set
-		 * @param string $dlr_callback
-		 * @param string $reply_callback
-		 * @param int $validity
-         *
-		 */
-		public function sendSms($message, $to='', $from='', $send_at='', $list_id=0, $dlr_callback='', $reply_callback='', $validity=0)
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('send-sms', $params));			
-		}
-		
-		/**
-		 * Get data about a sent message.
-		 * 
-		 * @param int $message_id
-		 * 
-		 */
-		public static function getSms($message_id)
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('get-sms', $params));
-		}
-		
-		/**
-		 * Get sent messages.
-		 * 
-		 * @param int $message_id
-		 * @param int $page
-		 * @param int $max
-		 * @param string $optouts can be 'only', 'omit', 'include'
-		 *  
-		 */
-		public static function getSmsSent($message_id, $page=1, $max=10, $optouts='include')
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('get-sms-sent', $params));
-		}
-		
-		/**
-		 * Get SMS responses.
-		 * 
-		 * @param int $message_id
-		 * @param int $keyword_id
-		 * @param string $keyword
-		 * @param string $number
-		 * @param string $msisdn
-		 * @param int $page
-		 * @param int $max
-		 * 
-		 */
-		public static function getSmsResponses($message_id, $keyword_id=0, $keyword='', $number='', $msisdn='', $page=1, $max=10)
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('get-sms-responses', $params));			
-		}
-
-		/**
-		 * Get SMS responses for user
-		 * 
-		 * @param datetime $start
-		 * @param datetime $end
-		 * @param int $page
-		 * @param int $max
-		 * @param string $keywords 
-		 * 
-		 */
-		public static function getUserSmsResponses($start=null, $end=null, $page=1, $max=10, $keywords='both', $number = '')
-		{
-			$params = get_defined_vars();
-			self::prepareFieldsForEdit($params);
-			return self::handleResponse(self::request('get-user-sms-responses', $params));			
-		}
-
-		/**
-		 * Get SMS sent by user in certain time frame
-		 * 
-		 * @param datetime $start
-		 * @param datetime $end
-		 * @param int $page
-		 * @param int $max
-		 * 
-		 */
-		public static function getUserSmsSent($start=null, $end=null, $page=1, $max=10)
-		{
-			$params = get_defined_vars();
-			self::prepareFieldsForEdit($params);
-			return self::handleResponse(self::request('get-user-sms-sent', $params));			
-		}
-		
-		/**
-		 * Cancel a scheduled SMS
-		 * 
-		 * @param int $id
-		 * 
-		 */
-		public static function cancelSms($id)
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('cancel-sms', $params));			
-		}
-		
-		
-		/**
-		 * Get information about a list and its members.
-		 * 
-		 * @param int $list_id
-		 * @param int $page
-		 * @param int $max
-		 * @param string $members can be 'active', 'inactive', 'all', 'none'
-		 * 
-		 */
-		public static function getList($list_id, $page=1, $max=10, $members='active')
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('get-list', $params));
-		}
-		
-		/**
-		 * Get the metadata of your lists.
-
-		 * @param int $page
-		 * @param int $max
-		 * 
-		 */
-		public static function getLists($page=1, $max=10)
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('get-lists', $params));			
-		}
-		
-		/**
-		 * Create a new list.
-		 * 
-		 * @param string $name
-		 * @param array $fields
-		 * 
-		 */
-		public static function addList($name, $fields=array())
-		{
-			$params['name']=$name;
-			self::indexCustomFields($params, $fields);
-			return self::handleResponse(self::request('add-list', $params));
-		}
-		
-		/**
-		 * Add a member to a list.
-		 * 
-		 * @param int $list_id
-		 * @param string $msisdn
-		 * @param string $first_name
-		 * @param string $last_name
-		 * @param array $fields
-		 * 
-		 */
-		public static function addToList($list_id, $msisdn, $first_name='', $last_name='', $fields=array())
-		{
-			$params=get_defined_vars();
-			unset($params['fields']);
-			self::indexCustomFields($params, $fields);
-			return self::handleResponse(self::request('add-to-list', $params));			
-		}
-		
-		/**
-		 * Edit a list member.
-		 * 
-		 * @param int $list_id
-		 * @param string $msisdn
-		 * @param string $first_name
-		 * @param string $last_name
-		 * @param array $fields
-		 * 
-		 */
-		public static function editListMember($list_id, $msisdn, $first_name=null, $last_name=null, $fields=array())
-		{
-			$params=get_defined_vars();
-			unset($params['fields']);
-			self::indexCustomFields($params, $fields);
-			self::prepareFieldsForEdit($params);
-			return self::handleResponse(self::request('edit-list-member', $params));			
-		}
-		
-		/**
-		 * Remove a member from one list or all lists.
-		 * 
-		 * @param int $list_id
-		 * @param string $msisdn
-		 * 
-		 */
-		public static function deleteFromList($list_id, $msisdn)
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('delete-from-list', $params));
-		}
-		
-		/**
-		 * Opt-out a member from one list or all lists.
-		 * 
-		 * @param int $list_id
-		 * @param string $msisdn
-		 * 
-		 */
-		public static function optoutListMember($list_id, $msisdn)
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('optout-list-member', $params));
-		}		
-		
-		/**
-		 * Get leased number details 
-		 * 
-		 * @param string $number
-		 * 
-		 */
-		
-		public static function getNumber($number)
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('get-number', $params));
-		}
-		
-		/**
-		 * Get a list of numbers.
-		 * 
-		 * @param int $page
-		 * @param int $max
-		 * @param string $filter
-		 * 
-		 */
-		public static function getNumbers($page=1, $max=10, $filter='owned')
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('get-numbers', $params));
-		}
-		
-		/**
-		 * Lease a response number.
-		 * 
-		 * @param string $number
-		 * 
-		 */
-		public static function leaseNumber($number='', $url='')
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('lease-number', $params));
-		}
-		
-		/**
-		 * Get a client.
-		 * 
-		 * @param int $client_id
-		 * 
-		 */
-		public static function getClient($client_id)
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('get-client', $params));
-		}
-		
-		/**
-		 * Get a list of clients.
-		 * 
-		 * @param int $page
-		 * @param int $max
-		 * 
-		 */		
-		public static function getClients($page=1, $max=10)
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('get-clients', $params));			
-		}
-		
-		/**
-		 * Add a new client
-		 * 
-		 * @param string $name
-		 * @param string $email
-		 * @param string $password
-		 * @param string $msisdn
-		 * @param string $contact
-		 * @param string $timezone
-		 * @param bool $client_pays
-		 * @param float $sms_margin
-		 * 
-		 */
-		public static function addClient($name, $email, $password, $msisdn, $contact='', $timezone='', $client_pays=true, $sms_margin=0.0)
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('add-client', $params));
-		}
-		
-		/**
-		 * Edit a client
-		 *
-		 * @param int $id
-		 * @param string $name
-		 * @param string $email
-		 * @param string $password
-		 * @param string $msisdn
-		 * @param string $contact
-		 * @param string $timezone
-		 * @param bool $client_pays
-		 * @param float $sms_margin
-		 * 
-		 */
-		public static function editClient($client_id, $name=null, $email=null, $password=null, $msisdn=null, $contact=null, $timezone=null, $client_pays=null, $sms_margin=null)
-		{
-			$params = get_defined_vars();
-			self::prepareFieldsForEdit($params);
-			return self::handleResponse(self::request('edit-client', $params));
-		}
-		
-		/**
-		 * Add a keyword to your existing response number.
-		 * 
-		 * @param string $keyword
-		 * @param string $number
-		 * @param string $reference
-		 * @param int $list_id
-		 * @param string $welcome_message
-		 * @param string $members_message
-		 * @param bool $activate
-		 * @param string $forward_url
-		 * @param string $forward_email
-		 * @param string $forward_sms
-		 * 
-		 */
-		public static function addKeyword($keyword, $number, $reference='', $list_id=0, $welcome_message='', $members_message='', $activate=true, $forward_url='', $forward_email='', $forward_sms='')
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('add-keyword', $params));
-		}
-		
-		/**
-		 * Edit an existing keyword.
-		 * 
-		 * @param string $keyword
-		 * @param string $number
-		 * @param string $reference
-		 * @param int $list_id
-		 * @param string $welcome_message
-		 * @param string $members_message
-		 * @param string $status
-		 * @param string $forward_url
-		 * @param string $forward_email
-		 * @param string $forward_sms
-		 * 
-		 */
-		public static function editKeyword($keyword, $number, $reference=null, $list_id=null, $welcome_message=null, $members_message=null, $status=null, $forward_url=null, $forward_email=null, $forward_sms=null)
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('edit-keyword', $params));
-		}
-		
-		/**
-		 * Get a list of existing keywords.
-		 * 
-		 * @param string $number
-		 * @param int $page
-		 * @param int $max
-		 * 
-		 */
-		public static function getKeywords($number='',$page=1, $max=10)
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('get-keywords', $params));			
-		}
-		
-		/**
-		 * Get a list of transactions for a client.
-		 * 
-		 * @param int $client_id
-		 * @param datetime $start
-		 * @param datetime $end
-		 * 
-		 */
-		public static function getTransactions($client_id, $start=null, $end=null, $page=1, $max=10)
-		{
-			$params = get_defined_vars();
-			self::prepareFieldsForEdit($params);
-			return self::handleResponse(self::request('get-transactions', $params));
-		}
-		
-		/**
-		 * Get a transaction.
-		 * 
-		 * @param int $id
-		 * 
-		 */
-		public static function getTransaction($id)
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('get-transaction', $params));
-		}
-		
-		/**
-		 * Register an email address for Email to SMS.
-		 * 
-		 * @param string $email
-		 * @param int $max_sms
-		 * @param string $number
-		 * 
-		 */
-		public static function addEmail($email, $max_sms=1, $number='')
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('add-email', $params));			
-		}
-		
-		/**
-		 * Remove an email address from Email to SMS.
-		 * 
-		 * @param string $email
-		 * 
-		 */
-		public static function deleteEmail($email)
-		{
-			$params = get_defined_vars();
-			return self::handleResponse(self::request('delete-email', $params));			
-		}
-		
-		/**
-		 * Get active user's balance
-		 * 
-		 */
-		public static function getBalance()
-		{
-			return self::handleResponse(self::request('get-balance'));
-		}
-	}
-?>
diff --git a/src/Abreeden/TransmitsmsApi/TransmitsmsApiServiceProvider.php b/src/Abreeden/TransmitsmsApi/TransmitsmsApiServiceProvider.php
deleted file mode 100644
index 40ebdee..0000000
--- a/src/Abreeden/TransmitsmsApi/TransmitsmsApiServiceProvider.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php namespace Abreeden\TransmitsmsApi;
-
-use Illuminate\Support\ServiceProvider;
-
-class TransmitsmsApiServiceProvider extends ServiceProvider {
-
-	/**
-	 * Indicates if loading of the provider is deferred.
-	 *
-	 * @var bool
-	 */
-	protected $defer = false;
-
-	/**
-	 * Bootstrap the application events.
-	 *
-	 * @return void
-	 */
-	public function boot()
-	{
-		$this->package('abreeden/transmitsms-api');
-	}
-
-	/**
-	 * Register the service provider.
-	 *
-	 * @return void
-	 */
-	public function register()
-	{
-		$this->app->booting(function()
-{
-  $loader = \Illuminate\Foundation\AliasLoader::getInstance();
-  $loader->alias('TransmitsmsApi', 'abreeden\TransmitsmsApi\Facades\TransmitsmsApi');
-});
-		  $this->app['transmitsmsapi'] = $this->app->share(function($app)
-		  {
-		    return new TransmitsmsApi;
-		  });
-
-	}
-
-	/**
-	 * Get the services provided by the provider.
-	 *
-	 * @return array
-	 */
-	public function provides()
-	{
-		return array();
-	}
-
-}
diff --git a/src/Facades/TransmitsmsApiFacade.php b/src/Facades/TransmitsmsApiFacade.php
new file mode 100644
index 0000000..72b7a94
--- /dev/null
+++ b/src/Facades/TransmitsmsApiFacade.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Abreeden\TransmitsmsApi\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+class TransmitsmsApiFacade extends Facade
+{
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
+        return 'transmitsmsapi';
+    }
+}
diff --git a/src/TransmitsmsApi.php b/src/TransmitsmsApi.php
new file mode 100644
index 0000000..334f800
--- /dev/null
+++ b/src/TransmitsmsApi.php
@@ -0,0 +1,548 @@
+<?php
+
+namespace Abreeden\TransmitsmsApi;
+
+class TransmitsmsApi
+{
+	public $url='https://api.transmitsms.com/';
+
+	protected $version=2;
+
+	protected $authHeader;
+
+	protected $responseRawData;
+
+	protected $responseStatus;
+
+	public function __construct($key, $secret)
+	{
+		$this->authHeader=array('Authorization: Basic '.base64_encode($key.':'.$secret));
+	}
+
+	protected function generateError($code, $description)
+	{
+		$error = new \stdClass;
+        $error->error = new \stdClass;
+        $error->error->code = $code;
+		$error->error->description = $description;
+		return $error;
+	}
+
+	protected function getRequestURL($method)
+	{
+		return $this->url.'/'.$this->version.'/'.$method.'.json';
+	}
+
+	protected function request($method, $params=array())
+	{
+		$requestUrl=$this->getRequestURL($method);
+
+		$ch = curl_init($requestUrl);
+		if (! $ch) {
+			return $this->generateError('REQUEST_FAILED' ,"Error connecting to the server {$requestUrl} : ". curl_errno($ch) .':'. curl_error($ch));
+		}
+
+		$urlInfo = parse_url($requestUrl);
+		$port = (preg_match("/https|ssl/i", $urlInfo["scheme"])) ? 443 : 80;
+
+		// curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($ch, CURLOPT_POST, true);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
+		curl_setopt($ch, CURLOPT_USERAGENT, "transmitsmsAPI v." . $this->version);
+		curl_setopt($ch, CURLOPT_PORT, $port);
+		curl_setopt($ch, CURLOPT_MAXREDIRS, 3);
+		curl_setopt($ch, CURLOPT_HTTPHEADER, $this->authHeader);
+
+		$this->responseRawData = curl_exec($ch);
+		if (! $this->responseRawData) {
+			return $this->generateError('REQUEST_FAILED' ,"Problem executing request, try changing above set options and re-requesting : ".curl_errno($ch) .':' .curl_error($ch));
+		}
+		$this->responseStatus=curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		return json_decode($this->responseRawData);//, false, 512, JSON_BIGINT_AS_STRING);
+	}
+
+	protected function handleResponse($response)
+	{
+		if($response===null)
+			return $this->generateError("INVALID_RESPONSE", "Invalid response, received data: ".$this->responseRawData);
+		//possible checks for login failure and other common mistakes
+		return $response;
+	}
+
+	protected function indexCustomFields(&$params, $fields)
+	{
+		if(!count($fields))
+			return;
+		if(isset($fields[0]))
+		{
+			// this is not an associative array, we iterate and indexify from 1 to 10
+			$fieldIndex=1;
+			foreach($fields as $field)
+			{
+				$params["field.{$fieldIndex}"]=$field;
+				$fieldIndex++;
+			}
+		}
+		else
+		{
+			// this is an associative array, we iterate and keep the indexes
+			foreach($fields as $fieldIndex=>$field)
+			{
+				$params["field.{$fieldIndex}"]=$field;
+			}
+		}
+	}
+
+	protected function prepareFieldsForEdit(&$params)
+	{
+		foreach ($params as $key=>$value) {
+			if($value===null)
+				unset($params[$key]);
+		}
+	}
+
+	/**
+	 * Send SMS messages.
+	 *
+	 * @param string $message
+	 * @param string $to - required if list_id is not set
+	 * @param string $from
+	 * @param datetime $send_at
+	 * @param int $list_id - required if to is not set
+	 * @param string $dlr_callback
+	 * @param string $reply_callback
+	 * @param int $validity
+     *
+	 */
+	public function sendSms($message, $to='', $from='', $send_at='', $list_id=0, $dlr_callback='', $reply_callback='', $validity=0, $replies_to_email='')
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('send-sms', $params));
+	}
+
+	/**
+	 * Get data about a sent message.
+	 *
+	 * @param int $message_id
+	 *
+	 */
+	public function getSms($message_id)
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('get-sms', $params));
+	}
+
+	/**
+	 * Get sent messages.
+	 *
+	 * @param int $message_id
+	 * @param int $page
+	 * @param int $max
+	 * @param string $optouts can be 'only', 'omit', 'include'
+	 *
+	 */
+	public function getSmsSent($message_id, $page=1, $max=10, $optouts='include')
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('get-sms-sent', $params));
+	}
+
+	/**
+	 * Get SMS responses.
+	 *
+	 * @param int $message_id
+	 * @param int $keyword_id
+	 * @param string $keyword
+	 * @param string $number
+	 * @param string $msisdn
+	 * @param int $page
+	 * @param int $max
+	 *
+	 */
+	public function getSmsResponses($message_id, $keyword_id=0, $keyword='', $number='', $msisdn='', $page=1, $max=10, $include_original=false)
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('get-sms-responses', $params));
+	}
+
+	/**
+	 * Get SMS responses for user
+	 *
+	 * @param datetime $start
+	 * @param datetime $end
+	 * @param int $page
+	 * @param int $max
+	 * @param string $keywords
+	 *
+	 */
+	public function getUserSmsResponses($start=null, $end=null, $page=1, $max=10, $keywords='both', $number = '', $include_original=false)
+	{
+		$params = get_defined_vars();
+		$this->prepareFieldsForEdit($params);
+		return $this->handleResponse($this->request('get-user-sms-responses', $params));
+	}
+
+	/**
+	 * Get SMS sent by user in certain time frame
+	 *
+	 * @param datetime $start
+	 * @param datetime $end
+	 * @param int $page
+	 * @param int $max
+	 *
+	 */
+	public function getUserSmsSent($start=null, $end=null, $page=1, $max=10)
+	{
+		$params = get_defined_vars();
+		$this->prepareFieldsForEdit($params);
+		return $this->handleResponse($this->request('get-user-sms-sent', $params));
+	}
+
+	/**
+	 * Cancel a scheduled SMS
+	 *
+	 * @param int $id
+	 *
+	 */
+	public function cancelSms($id)
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('cancel-sms', $params));
+	}
+
+
+	/**
+	 * Get information about a list and its members.
+	 *
+	 * @param int $list_id
+	 * @param int $page
+	 * @param int $max
+	 * @param string $members can be 'active', 'inactive', 'all', 'none'
+	 *
+	 */
+	public function getList($list_id, $page=1, $max=10, $members='active')
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('get-list', $params));
+	}
+
+	/**
+	 * Get the metadata of your lists.
+
+	 * @param int $page
+	 * @param int $max
+	 *
+	 */
+	public function getLists($page=1, $max=10)
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('get-lists', $params));
+	}
+
+	/**
+	 * Create a new list.
+	 *
+	 * @param string $name
+	 * @param array $fields
+	 *
+	 */
+	public function addList($name, $fields=array())
+	{
+		$params['name']=$name;
+		$this->indexCustomFields($params, $fields);
+		return $this->handleResponse($this->request('add-list', $params));
+	}
+
+	/**
+	 * Add a member to a list.
+	 *
+	 * @param int $list_id
+	 * @param string $msisdn
+	 * @param string $first_name
+	 * @param string $last_name
+	 * @param array $fields
+	 *
+	 */
+	public function addToList($list_id, $msisdn, $first_name='', $last_name='', $fields=array())
+	{
+		$params=get_defined_vars();
+		unset($params['fields']);
+		$this->indexCustomFields($params, $fields);
+		return $this->handleResponse($this->request('add-to-list', $params));
+	}
+
+	/**
+	 * Edit a list member.
+	 *
+	 * @param int $list_id
+	 * @param string $msisdn
+	 * @param string $first_name
+	 * @param string $last_name
+	 * @param array $fields
+	 *
+	 */
+	public function editListMember($list_id, $msisdn, $first_name=null, $last_name=null, $fields=array())
+	{
+		$params=get_defined_vars();
+		unset($params['fields']);
+		$this->indexCustomFields($params, $fields);
+		$this->prepareFieldsForEdit($params);
+		return $this->handleResponse($this->request('edit-list-member', $params));
+	}
+
+	/**
+	 * Remove a member from one list or all lists.
+	 *
+	 * @param int $list_id
+	 * @param string $msisdn
+	 *
+	 */
+	public function deleteFromList($list_id, $msisdn)
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('delete-from-list', $params));
+	}
+
+	/**
+	 * Opt-out a member from one list or all lists.
+	 *
+	 * @param int $list_id
+	 * @param string $msisdn
+	 *
+	 */
+	public function optoutListMember($list_id, $msisdn)
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('optout-list-member', $params));
+	}
+
+	/**
+	 * Get leased number details
+	 *
+	 * @param string $number
+	 *
+	 */
+
+	public function getNumber($number)
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('get-number', $params));
+	}
+
+	/**
+	 * Get a list of numbers.
+	 *
+	 * @param int $page
+	 * @param int $max
+	 * @param string $filter
+	 *
+	 */
+	public function getNumbers($page=1, $max=10, $filter='owned')
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('get-numbers', $params));
+	}
+
+	/**
+	 * Lease a response number.
+	 *
+	 * @param string $number
+	 *
+	 */
+	public function leaseNumber($number='', $url='')
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('lease-number', $params));
+	}
+
+	/**
+	 * Get a client.
+	 *
+	 * @param int $client_id
+	 *
+	 */
+	public function getClient($client_id)
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('get-client', $params));
+	}
+
+	/**
+	 * Get a list of clients.
+	 *
+	 * @param int $page
+	 * @param int $max
+	 *
+	 */
+	public function getClients($page=1, $max=10)
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('get-clients', $params));
+	}
+
+	/**
+	 * Add a new client
+	 *
+	 * @param string $name
+	 * @param string $email
+	 * @param string $password
+	 * @param string $msisdn
+	 * @param string $contact
+	 * @param string $timezone
+	 * @param bool $client_pays
+	 * @param float $sms_margin
+	 *
+	 */
+	public function addClient($name, $email, $password, $msisdn, $contact='', $timezone='', $client_pays=true, $sms_margin=0.0)
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('add-client', $params));
+	}
+
+	/**
+	 * Edit a client
+	 *
+	 * @param int $id
+	 * @param string $name
+	 * @param string $email
+	 * @param string $password
+	 * @param string $msisdn
+	 * @param string $contact
+	 * @param string $timezone
+	 * @param bool $client_pays
+	 * @param float $sms_margin
+	 *
+	 */
+	public function editClient($client_id, $name=null, $email=null, $password=null, $msisdn=null, $contact=null, $timezone=null, $client_pays=null, $sms_margin=null)
+	{
+		$params = get_defined_vars();
+		$this->prepareFieldsForEdit($params);
+		return $this->handleResponse($this->request('edit-client', $params));
+	}
+
+	/**
+	 * Add a keyword to your existing response number.
+	 *
+	 * @param string $keyword
+	 * @param string $number
+	 * @param string $reference
+	 * @param int $list_id
+	 * @param string $welcome_message
+	 * @param string $members_message
+	 * @param bool $activate
+	 * @param string $forward_url
+	 * @param string $forward_email
+	 * @param string $forward_sms
+	 *
+	 */
+	public function addKeyword($keyword, $number, $reference='', $list_id=0, $welcome_message='', $members_message='', $activate=true, $forward_url='', $forward_email='', $forward_sms='')
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('add-keyword', $params));
+	}
+
+	/**
+	 * Edit an existing keyword.
+	 *
+	 * @param string $keyword
+	 * @param string $number
+	 * @param string $reference
+	 * @param int $list_id
+	 * @param string $welcome_message
+	 * @param string $members_message
+	 * @param string $status
+	 * @param string $forward_url
+	 * @param string $forward_email
+	 * @param string $forward_sms
+	 *
+	 */
+	public function editKeyword($keyword, $number, $reference=null, $list_id=null, $welcome_message=null, $members_message=null, $status=null, $forward_url=null, $forward_email=null, $forward_sms=null)
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('edit-keyword', $params));
+	}
+
+	/**
+	 * Get a list of existing keywords.
+	 *
+	 * @param string $number
+	 * @param int $page
+	 * @param int $max
+	 *
+	 */
+	public function getKeywords($number='',$page=1, $max=10)
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('get-keywords', $params));
+	}
+
+	/**
+	 * Get a list of transactions for a client.
+	 *
+	 * @param int $client_id
+	 * @param datetime $start
+	 * @param datetime $end
+	 *
+	 */
+	public function getTransactions($client_id, $start=null, $end=null, $page=1, $max=10)
+	{
+		$params = get_defined_vars();
+		$this->prepareFieldsForEdit($params);
+		return $this->handleResponse($this->request('get-transactions', $params));
+	}
+
+	/**
+	 * Get a transaction.
+	 *
+	 * @param int $id
+	 *
+	 */
+	public function getTransaction($id)
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('get-transaction', $params));
+	}
+
+	/**
+	 * Register an email address for Email to SMS.
+	 *
+	 * @param string $email
+	 * @param int $max_sms
+	 * @param string $number
+	 *
+	 */
+	public function addEmail($email, $max_sms=1, $number='')
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('add-email', $params));
+	}
+
+	/**
+	 * Remove an email address from Email to SMS.
+	 *
+	 * @param string $email
+	 *
+	 */
+	public function deleteEmail($email)
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('delete-email', $params));
+	}
+
+	/**
+	 * Get active user's balance
+	 *
+	 */
+	public function getBalance()
+	{
+		return $this->handleResponse($this->request('get-balance'));
+	}
+
+	public function formatNumber($msisdn, $countrycode)
+	{
+		$params = get_defined_vars();
+		return $this->handleResponse($this->request('format-number', $params));
+	}
+}
diff --git a/src/TransmitsmsApiServiceProvider.php b/src/TransmitsmsApiServiceProvider.php
new file mode 100644
index 0000000..adb7463
--- /dev/null
+++ b/src/TransmitsmsApiServiceProvider.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Abreeden\TransmitsmsApi;
+
+use Illuminate\Support\ServiceProvider;
+
+class TransmitsmsApiServiceProvider extends ServiceProvider {
+
+	/**
+	 * Indicates if loading of the provider is deferred.
+	 *
+	 * @var bool
+	 */
+	protected $defer = false;
+
+	/**
+	 * Bootstrap the application events.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->publishes([
+            __DIR__.'/config/config.php' => config_path('transmitsmsapi.php'),
+        ], 'config');
+
+        $this->app['Abreeden\TransmitSmsApi\TransmitSmsApi'] = function ($app) {
+            return $app['transmitsmsapi'];
+        };
+
+	}
+
+	/**
+	 * Register the service provider.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+        $this->mergeConfigFrom(__DIR__.'/config/config.php', 'transmitsmsapi');
+
+        $this->app['transmitsmsapi'] = $this->app->share(function($app)
+        {
+            $config = $app['config']->get('transmitsmsapi');
+
+            return new TransmitsmsApi($config['api_key'], $config['secret']);
+        });
+
+	}
+}
diff --git a/src/config/config.php b/src/config/config.php
new file mode 100644
index 0000000..1c5bcfa
--- /dev/null
+++ b/src/config/config.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | SMS API Key
+    |--------------------------------------------------------------------------
+    */
+
+    'api_key' => env('SMS_API_KEY', 'changeme'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | SMS API Secret
+    |--------------------------------------------------------------------------
+    */
+
+    'secret' => env('SMS_SECRET', 'secret'),
+
+];