Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/version.txt
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/version.txt	(revision 11)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/version.txt	(revision 12)
@@ -1 +1 @@
-version 1.3.6
\ No newline at end of file
+version 1.4
\ No newline at end of file
Index: E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/twitter.class.php
===================================================================
--- E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/twitter.class.php	(revision 11)
+++ E:/WebWork/themeforest/theme-Dresscode/oc/svn/trunk/www/catalog/view/theme/dresscode/template/common/twitter.class.php	(revision 12)
@@ -64,20 +64,20 @@
  */
 class Twitter
 {
-	// internal constant to enable/disable debugging
+    /* internal constant to enable/disable debugging  */
 	const DEBUG = false;
 
 	// url for the twitter-api
-	const API_URL = 'https://api.twitter.com/1';
+	const API_URL = 'https://api.twitter.com/1.1';
 	const SEARCH_API_URL = 'https://search.twitter.com';
-	const SECURE_API_URL = 'https://api.twitter.com';
+	const SECURE_API_URL = 'https://api.twitter.com/1.1';
 
-	// port for the twitter-api
+	/* port for the twitter-api */
 	const API_PORT = 443;
 	const SEARCH_API_PORT = 443;
 	const SECURE_API_PORT = 443;
 
-	// current version
+	/* current version   */
 	const VERSION = '2.1.2';
 
 
@@ -137,14 +137,14 @@
 	private $userAgent;
 
 
-// class methods
-	/**
-	 * Default constructor
-	 *
-	 * @return	void
-	 * @param	string $consumerKey		The consumer key to use.
-	 * @param	string $consumerSecret	The consumer secret to use.
-	 */
+    /* class methods  */
+     /**
+      * Default constructor
+      *
+      * @return	void
+      * @param	string $consumerKey		The consumer key to use.
+      * @param	string $consumerSecret	The consumer secret to use.
+      */
 	public function __construct($consumerKey, $consumerSecret)
 	{
 		$this->setConsumerKey($consumerKey);
@@ -171,32 +171,32 @@
 	 */
 	private function buildQuery(array $parameters)
 	{
-		// no parameters?
+        /* no parameters?   */
 		if(empty($parameters)) return '';
 
-		// encode the keys
+        /* encode the keys  */
 		$keys = self::urlencode_rfc3986(array_keys($parameters));
 
-		// encode the values
+        /* encode the values */
 		$values = self::urlencode_rfc3986(array_values($parameters));
 
-		// reset the parameters
+        /* reset the parameters */
 		$parameters = array_combine($keys, $values);
 
-		// sort parameters by key
+        /* sort parameters by key */
 		uksort($parameters, 'strcmp');
 
-		// loop parameters
+        /* loop parameters */
 		foreach($parameters as $key => $value)
 		{
-			// sort by value
+            /* sort by value */
 			if(is_array($value)) $parameters[$key] = natsort($value);
 		}
 
-		// process parameters
+        /* process parameters */
 		foreach($parameters as $key => $value) $chunks[] = $key . '=' . str_replace('%25', '%', $value);
 
-		// return
+        /* return     */
 		return implode('&', $chunks);
 	}
 
@@ -218,39 +218,39 @@
 	 */
 	private function calculateBaseString($url, $method, array $parameters)
 	{
-		// redefine
+        /* redefine  */
 		$url = (string) $url;
 		$parameters = (array) $parameters;
 
-		// init var
+        /* init var  */
 		$pairs = array();
 		$chunks = array();
 
-		// sort parameters by key
+        /* sort parameters by key  */
 		uksort($parameters, 'strcmp');
 
-		// loop parameters
+        /* loop parameters  */
 		foreach($parameters as $key => $value)
 		{
-			// sort by value
+            /* sort by value  */
 			if(is_array($value)) $parameters[$key] = natsort($value);
 		}
 
-		// process queries
+        /* process queries  */
 		foreach($parameters as $key => $value)
 		{
-			// only add if not already in the url
+            /* only add if not already in the url   */
 			if(substr_count($url, $key . '=' . $value) == 0) $chunks[] = self::urlencode_rfc3986($key) . '%3D' . self::urlencode_rfc3986($value);
 		}
 
-		// buils base
+        /* buils base   */
 		$base = $method . '&';
 		$base .= urlencode($url);
 		$base .= (substr_count($url, '?')) ? '%26' : '&';
 		$base .= implode('%26', $chunks);
 		$base = str_replace('%3F', '&', $base);
 
-		// return
+        /* return  */
 		return $base;
 	}
 
@@ -265,23 +265,23 @@
 	 */
 	private function calculateHeader(array $parameters, $url)
 	{
-		// redefine
+        /* redefine  */
 		$url = (string) $url;
 
-		// divide into parts
+        /* divide into parts */
 		$parts = parse_url($url);
 
-		// init var
+        /* init var */
 		$chunks = array();
 
-		// process queries
+        /* process queries */
 		foreach($parameters as $key => $value) $chunks[] = str_replace('%25', '%', self::urlencode_rfc3986($key) . '="' . self::urlencode_rfc3986($value) . '"');
 
-		// build return
+        /* build return  */
 		$return = 'Authorization: OAuth realm="' . $parts['scheme'] . '://' . $parts['host'] . $parts['path'] . '", ';
 		$return .= implode(',', $chunks);
 
-		// prepend name and OAuth part
+        /* prepend name and OAuth part */
 		return $return;
 	}
 
@@ -296,26 +296,26 @@
 	 */
 	private function doOAuthCall($method, array $parameters = null)
 	{
-		// redefine
+        /* redefine    */
 		$method = (string) $method;
 
-		// append default parameters
+        /* append default parameters  */
 		$parameters['oauth_consumer_key'] = $this->getConsumerKey();
 		$parameters['oauth_nonce'] = md5(microtime() . rand());
 		$parameters['oauth_timestamp'] = time();
 		$parameters['oauth_signature_method'] = 'HMAC-SHA1';
 		$parameters['oauth_version'] = '1.0';
 
-		// calculate the base string
+        /* calculate the base string */
 		$base = $this->calculateBaseString(self::SECURE_API_URL . '/oauth/' . $method, 'POST', $parameters);
 
-		// add sign into the parameters
+        /* add sign into the parameters  */
 		$parameters['oauth_signature'] = $this->hmacsha1($this->getConsumerSecret() . '&' . $this->getOAuthTokenSecret(), $base);
 
-		// calculate header
+        /* calculate header  */
 		$header = $this->calculateHeader($parameters, self::SECURE_API_URL . '/oauth/' . $method);
 
-		// set options
+        /* set options  */
 		$options[CURLOPT_URL] = self::SECURE_API_URL . '/oauth/' . $method;
 		$options[CURLOPT_PORT] = self::SECURE_API_PORT;
 		$options[CURLOPT_USERAGENT] = $this->getUserAgent();
@@ -328,30 +328,30 @@
 		$options[CURLOPT_POST] = true;
 		$options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
 
-		// init
+        /* init */
 		$this->curl = curl_init();
 
-		// set options
+        /* set options */
 		curl_setopt_array($this->curl, $options);
 
-		// execute
+        /* execute  */
 		$response = curl_exec($this->curl);
 		$headers = curl_getinfo($this->curl);
 
-		// fetch errors
+        /* fetch errors  */
 		$errorNumber = curl_errno($this->curl);
 		$errorMessage = curl_error($this->curl);
 
-		// error?
+        /* error? */
 		if($errorNumber != '') throw new TwitterException($errorMessage, $errorNumber);
 
-		// init var
+        /* init var  */
 		$return = array();
 
-		// parse the string
+        /* parse the string */
 		parse_str($response, $return);
 
-		// return
+        /* return    */
 		return $return;
 	}
 
@@ -370,20 +370,20 @@
 	 */
 	private function doCall($url, array $parameters = null, $authenticate = false, $method = 'GET', $filePath = null, $expectJSON = true, $returnHeaders = false)
 	{
-		// allowed methods
+        /* allowed methods */
 		$allowedMethods = array('GET', 'POST');
 
-		// redefine
+        /* redefine */
 		$url = (string) $url;
 		$parameters = (array) $parameters;
 		$authenticate = (bool) $authenticate;
 		$method = (string) $method;
 		$expectJSON = (bool) $expectJSON;
 
-		// validate method
+        /* validate method  */
 		if(!in_array($method, $allowedMethods)) throw new TwitterException('Unknown method (' . $method . '). Allowed methods are: ' . implode(', ', $allowedMethods));
 
-		// append default parameters
+        /* append default parameters  */
 		$oauth['oauth_consumer_key'] = $this->getConsumerKey();
 		$oauth['oauth_nonce'] = md5(microtime() . rand());
 		$oauth['oauth_timestamp'] = time();
@@ -391,35 +391,35 @@
 		$oauth['oauth_signature_method'] = 'HMAC-SHA1';
 		$oauth['oauth_version'] = '1.0';
 
-		// set data
+        /* set data  */
 		$data = $oauth;
 		if(!empty($parameters)) $data = array_merge($data, $parameters);
 
-		// calculate the base string
+        /* calculate the base string */
 		$base = $this->calculateBaseString(self::API_URL . '/' . $url, $method, $data);
 
-		// based on the method, we should handle the parameters in a different way
+        /* based on the method, we should handle the parameters in a different way */
 		if($method == 'POST')
 		{
-			// file provided?
+            /* file provided?  */
 			if($filePath != null)
 			{
-				// build a boundary
+                /* build a boundary */
 				$boundary = md5(time());
 
-				// process file
+                /* process file  */
 				$fileInfo = pathinfo($filePath);
 
-				// set mimeType
+                /* set mimeType  */
 				$mimeType = 'application/octet-stream';
 				if($fileInfo['extension'] == 'jpg' || $fileInfo['extension'] == 'jpeg') $mimeType = 'image/jpeg';
 				elseif($fileInfo['extension'] == 'gif') $mimeType = 'image/gif';
 				elseif($fileInfo['extension'] == 'png') $mimeType = 'image/png';
 
-				// init var
+                /* init var  */
 				$content = '--' . $boundary . "\r\n";
 
-				// set file
+                /* set file  */
 				$content .= 'Content-Disposition: form-data; name=image; filename="' . $fileInfo['basename'] . '"' . "\r\n";
 				$content .= 'Content-Type: ' . $mimeType . "\r\n";
 				$content .= "\r\n";
@@ -427,36 +427,36 @@
 				$content .= "\r\n";
 				$content .= "--" . $boundary . '--';
 
-				// build headers
+                /* build headers  */
 				$headers[] = 'Content-Type: multipart/form-data; boundary=' . $boundary;
 				$headers[] = 'Content-Length: ' . strlen($content);
 
-				// set content
+                /* set content */
 				$options[CURLOPT_POSTFIELDS] = $content;
 			}
 
-			// no file
+            /* no file  */
 			else $options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
 
-			// enable post
+            /* enable post */
 			$options[CURLOPT_POST] = true;
 		}
 
 		else
 		{
-			// add the parameters into the querystring
+            /* add the parameters into the querystring  */
 			if(!empty($parameters)) $url .= '?' . $this->buildQuery($parameters);
 
 			$options[CURLOPT_POST] = false;
 		}
 
-		// add sign into the parameters
+        /* add sign into the parameters   */
 		$oauth['oauth_signature'] = $this->hmacsha1($this->getConsumerSecret() . '&' . $this->getOAuthTokenSecret(), $base);
 
 		$headers[] = $this->calculateHeader($oauth, self::API_URL . '/' . $url);
 		$headers[] = 'Expect:';
 
-		// set options
+        /* set options  */
 		$options[CURLOPT_URL] = self::API_URL . '/' . $url;
 		$options[CURLOPT_PORT] = self::API_PORT;
 		$options[CURLOPT_USERAGENT] = $this->getUserAgent();
@@ -468,112 +468,112 @@
 		$options[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
 		$options[CURLOPT_HTTPHEADER] = $headers;
 
-		// init
+        /* init  */
 		if($this->curl == null) $this->curl = curl_init();
 
-		// set options
+        /* set options */
 		curl_setopt_array($this->curl, $options);
 
-		// execute
+        /* execute */
 		$response = curl_exec($this->curl);
 		$headers = curl_getinfo($this->curl);
 
-		// fetch errors
+        /* fetch errors */
 		$errorNumber = curl_errno($this->curl);
 		$errorMessage = curl_error($this->curl);
 
-		// return the headers
+        /* return the headers*/
 		if($returnHeaders) return $headers;
 
-		// we don't expext JSON, return the response
+        /* we don't expext JSON, return the response */
 		if(!$expectJSON) return $response;
 
-		// replace ids with their string values, added because of some PHP-version can't handle these large values
+        /* replace ids with their string values, added because of some PHP-version can't handle these large values */
 		$response = preg_replace('/id":(\d+)/', 'id":"\1"', $response);
 
-		// we expect JSON, so decode it
+        /* we expect JSON, so decode it   */
 		$json = @json_decode($response, true);
 
-		// validate JSON
+        /* validate JSON */
 		if($json === null)
 		{
-			// should we provide debug information
+            /* should we provide debug information  */
 			if(self::DEBUG)
 			{
-				// make it output proper
+                /* make it output proper   */
 				echo '<pre>';
 
-				// dump the header-information
+                /* dump the header-information  */
 				var_dump($headers);
 
-				// dump the error
+                /* dump the error  */
 				var_dump($errorMessage);
 
-				// dump the raw response
-				var_dump($response);
+                /* dump the raw response
+                    var_dump($response);
 
-				// end proper format
+                    /* end proper format  */
 				echo '</pre>';
 			}
 
-			// throw exception
+            /* throw exception  */
 			throw new TwitterException('Invalid response.');
 		}
 
 
-		// any errors
+        /* any errors  */
 		if(isset($json['errors']))
 		{
-			// should we provide debug information
+            /* should we provide debug information  */
 			if(self::DEBUG)
 			{
-				// make it output proper
+                /* make it output proper  */
 				echo '<pre>';
 
-				// dump the header-information
+                /* dump the header-information  */
 				var_dump($headers);
 
-				// dump the error
+                /* dump the error    */
 				var_dump($errorMessage);
 
-				// dump the raw response
+                /* dump the raw response   */
 				var_dump($response);
 
-				// end proper format
+                /* end proper format */
 				echo '</pre>';
 			}
 
-			// throw exception
+            /* throw exception  */
 			if(isset($json['errors'][0]['message'])) throw new TwitterException($json['errors'][0]['message']);
 			elseif(isset($json['errors']) && is_string($json['errors'])) throw new TwitterException($json['errors']);
 			else throw new TwitterException('Invalid response.');
 		}
 
 
-		// any error
+        /* any error */
 		if(isset($json['error']))
 		{
-			// should we provide debug information
+            /* should we provide debug information   */
 			if(self::DEBUG)
 			{
-				// make it output proper
+                /* make it output proper  */
 				echo '<pre>';
 
-				// dump the header-information
+                /* dump the header-information   */
 				var_dump($headers);
 
-				// dump the raw response
+                /* dump the raw response  */
 				var_dump($response);
 
-				// end proper format
+                /* end proper format  */
 				echo '</pre>';
 			}
 
-			// throw exception
+            /* throw exception  */
 			throw new TwitterException($json['error']);
 		}
 
-		// return
+        /* return  */
 		return $json;
 	}
 
@@ -587,14 +587,14 @@
 	 */
 	private function doSearchCall($url, array $parameters = null)
 	{
-		// redefine
+        /* redefine  */
 		$url = (string) $url;
 		$parameters = (array) $parameters;
 
-		// add the parameters into the querystring
+        /* add the parameters into the querystring  */
 		if(!empty($parameters)) $url .= '?' . $this->buildQuery($parameters);
 
-		// set options
+        /* set options  */
 		$options[CURLOPT_URL] = self::SEARCH_API_URL . '/' . $url;
 		$options[CURLOPT_PORT] = self::SEARCH_API_PORT;
 		$options[CURLOPT_USERAGENT] = $this->getUserAgent();
@@ -605,105 +605,105 @@
 		$options[CURLOPT_SSL_VERIFYHOST] = false;
 		$options[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
 
-		// init
+        /* init  */
 		if($this->curl == null) $this->curl = curl_init();
 
-		// set options
+        /* set options   */
 		curl_setopt_array($this->curl, $options);
 
-		// execute
+        /* execute  */
 		$response = curl_exec($this->curl);
 		$headers = curl_getinfo($this->curl);
 
-		// fetch errors
+        /* fetch errors  */
 		$errorNumber = curl_errno($this->curl);
 		$errorMessage = curl_error($this->curl);
 
-		// replace ids with their string values, added because of some PHP-version can't handle these large values
+        /* replace ids with their string values, added because of some PHP-version can't handle these large values  */
 		$response = preg_replace('/id":(\d+)/', 'id":"\1"', $response);
 
-		// we expect JSON, so decode it
+        /* we expect JSON, so decode it  */
 		$json = @json_decode($response, true);
 
-		// validate JSON
+        /* validate JSON */
 		if($json === null)
 		{
-			// should we provide debug information
+            /* should we provide debug information */
 			if(self::DEBUG)
 			{
-				// make it output proper
+                /* make it output proper  */
 				echo '<pre>';
 
-				// dump the header-information
+                /* dump the header-information */
 				var_dump($headers);
 
-				// dump the error
+                /* dump the error*/
 				var_dump($errorMessage);
 
-				// dump the raw response
+                /* dump the raw response   */
 				var_dump($response);
 
-				// end proper format
+                /* end proper format */
 				echo '</pre>';
 			}
 
-			// throw exception
+            /* throw exception */
 			throw new TwitterException('Invalid response.');
 		}
 
 
-		// any errors
+        /* any errors   */
 		if(isset($json['errors']))
 		{
-			// should we provide debug information
+            /* should we provide debug information */
 			if(self::DEBUG)
 			{
-				// make it output proper
+                /* make it output proper */
 				echo '<pre>';
 
-				// dump the header-information
+                /* dump the header-information */
 				var_dump($headers);
 
-				// dump the error
+                /* dump the error  */
 				var_dump($errorMessage);
 
-				// dump the raw response
+                /* dump the raw response  */
 				var_dump($response);
 
-				// end proper format
+                /* end proper format */
 				echo '</pre>';
 			}
 
-			// throw exception
+            /* throw exception */
 			if(isset($json['errors'][0]['message'])) throw new TwitterException($json['errors'][0]['message']);
 			else throw new TwitterException('Invalid response.');
 		}
 
 
-		// any error
+        /* any error */
 		if(isset($json['error']))
 		{
-			// should we provide debug information
+            /* should we provide debug information  */
 			if(self::DEBUG)
 			{
-				// make it output proper
+                /* make it output proper  */
 				echo '<pre>';
 
-				// dump the header-information
+                /* dump the header-information */
 				var_dump($headers);
 
-				// dump the raw response
+                /* dump the raw response  */
 				var_dump($response);
 
-				// end proper format
+                /* end proper format */
 				echo '</pre>';
 			}
 
-			// throw exception
+            /* throw exception   */
 			throw new TwitterException($json['error']);
 		}
 
-		// return
+        /* return */
 		return $json;
 	}
 
@@ -880,27 +880,27 @@
 	}
 
 
-// Timeline resources
-	/**
-	 * Returns the 20 most recent statuses from non-protected users who have set a custom user icon.
-	 * The public timeline is cached for 60 seconds and requesting it more often than that is unproductive and a waste of resources.
-	 *
-	 * @return	array
-	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
+    /* Timeline resources */
+     /**
+      * Returns the 20 most recent statuses from non-protected users who have set a custom user icon.
+      * The public timeline is cached for 60 seconds and requesting it more often than that is unproductive and a waste of resources.
+      *
+      * @return	array
+      * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+      * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+      */
 	public function statusesPublicTimeline($trimUser = false, $includeEntities = false)
 	{
-		// redefine
+        /* redefine  */
 		$trimUser = (bool) $trimUser;
 		$includeEntities = (bool) $includeEntities;
 
-		// build parameters
+        /* build parameters  */
 		$parameters = array();
 		if($trimUser) $parameters['trim_user'] = 'true';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('statuses/public_timeline.json', $parameters);
 	}
 
@@ -919,7 +919,7 @@
 	 */
 	public function statusesHomeTimeline($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters = array();
 		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
 		if($maxId != null) $parameters['max_id'] = (string) $maxId;
@@ -928,7 +928,7 @@
 		if($trimUser) $parameters['trim_user'] = 'true';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call*/
 		return (array) $this->doCall('statuses/home_timeline.json', $parameters, true);
 	}
 
@@ -948,7 +948,7 @@
 	 */
 	public function statusesFriendsTimeline($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeRts = false, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters = array();
 		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
 		if($maxId != null) $parameters['max_id'] = (string) $maxId;
@@ -958,7 +958,7 @@
 		if($includeRts) $parameters['include_rts'] = 'true';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call   */
 		return (array) $this->doCall('statuses/friends_timeline.json', $parameters, true);
 	}
 
@@ -980,7 +980,7 @@
 	 */
 	public function statusesUserTimeline($userId = null, $screenName = null, $sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeRts = false, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters = array();
 		if($userId != null) $parameters['user_id'] = (string) $userId;
 		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
@@ -992,7 +992,7 @@
 		if($includeRts) $parameters['include_rts'] = 'true';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call   */
 		return (array) $this->doCall('statuses/user_timeline.json', $parameters);
 
 
@@ -1014,20 +1014,20 @@
 	 */
 	public function statusesMentions($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeRts = false, $includeEntities = false)
 	{
-		// validate
+        /* validate  */
 		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
-		// build parameters
-		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($trimUser) $parameters['trim_user'] = 'true';
-		if($includeRts) $parameters['include_rts'] = 'true';
-		if($includeEntities) $parameters['include_entities'] = 'true';
+        /* build parameters
+          $parameters = array();
+          if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+          if($maxId != null) $parameters['max_id'] = (string) $maxId;
+          if($count != null) $parameters['count'] = (int) $count;
+          if($page != null) $parameters['page'] = (int) $page;
+          if($trimUser) $parameters['trim_user'] = 'true';
+          if($includeRts) $parameters['include_rts'] = 'true';
+          if($includeEntities) $parameters['include_entities'] = 'true'; */
 
-		// make the call
+         /* make the call  */
 		return (array) $this->doCall('statuses/mentions.json', $parameters, true);
 	}
 
@@ -1045,10 +1045,10 @@
 	 */
 	public function statusesRetweetedByMe($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeEntities = false)
 	{
-		// validate
+        /* validate  */
 		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
-		// build parameters
+        /* build parameters  */
 		$parameters = array();
 		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
 		if($maxId != null) $parameters['max_id'] = (string) $maxId;
@@ -1057,7 +1057,7 @@
 		if($trimUser) $parameters['trim_user'] = 'true';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('statuses/retweeted_by_me.json', $parameters, true);
 	}
 
@@ -1075,10 +1075,10 @@
 	 */
 	public function statusesRetweetedToMe($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeEntities = false)
 	{
-		// validate
+        /* validate  */
 		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
-		// build parameters
+        /* build parameters    */
 		$parameters = array();
 		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
 		if($maxId != null) $parameters['max_id'] = (string) $maxId;
@@ -1087,7 +1087,7 @@
 		if($trimUser) $parameters['trim_user'] = 'true';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('statuses/retweeted_by_me.json', $parameters, true);
 	}
 
@@ -1105,10 +1105,10 @@
 	 */
 	public function statusesReweetsOfMe($sinceId = null, $maxId = null, $count = null, $page = null, $trimUser = false, $includeEntities = false)
 	{
-		// validate
+        /* validate */
 		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
-		// build parameters
+        /* build parameters */
 		$parameters = array();
 		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
 		if($maxId != null) $parameters['max_id'] = (string) $maxId;
@@ -1117,28 +1117,28 @@
 		if($trimUser) $parameters['trim_user'] = 'true';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('statuses/retweets_of_me.json', $parameters, true);
 	}
 
 
-// Tweets resources
-	/**
-	 * Returns a single status, specified by the id parameter below. The status's author will be returned inline.
-	 *
-	 * @return	array
-	 * @param	string $id							The numerical ID of the desired status.
-	 * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
+    /* Tweets resources*/
+     /**
+      * Returns a single status, specified by the id parameter below. The status's author will be returned inline.
+      *
+      * @return	array
+      * @param	string $id							The numerical ID of the desired status.
+      * @param	bool[optional] $trimUser			When set to true each tweet returned in a timeline will include a user object including only the status authors numerical ID. Omit this parameter to receive the complete user object.
+      * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+      */
 	public function statusesShow($id, $trimUser = false, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters */
 		$parameters['id'] = (string) $id;
 		if($trimUser) $parameters['trim_user'] = 'true';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call   */
 		return (array) $this->doCall('statuses/show.json', $parameters, true);
 	}
 
@@ -1158,7 +1158,7 @@
 	 */
 	public function statusesUpdate($status, $inReplyToStatusId = null, $lat = null, $long = null, $placeId = null, $displayCoordinates = false, $trimUser = false, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters['status'] = (string) $status;
 		if($inReplyToStatusId != null) $parameters['in_reply_to_status_id'] = (string) $inReplyToStatusId;
 		if($lat != null) $parameters['lat'] = (float) $lat;
@@ -1168,7 +1168,7 @@
 		if($trimUser) $parameters['trim_user'] = 'true';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('statuses/update.json', $parameters, true, 'POST');
 	}
 
@@ -1184,12 +1184,12 @@
 	 */
 	public function statusesDestroy($id, $trimUser = false, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters */
 		$parameters['id'] = (string) $id;
 		if($trimUser) $parameters['trim_user'] = 'true';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('statuses/destroy.json', $parameters, true, 'POST');
 	}
 
@@ -1208,7 +1208,7 @@
 		if($trimUser) $parameters['trim_user'] = 'true';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('statuses/retweet/' . $id . '.json', $parameters, true, 'POST');
 	}
 
@@ -1224,16 +1224,16 @@
 	 */
 	public function statusesRetweets($id, $count = null, $trimUser = false, $includeEntities = false)
 	{
-		// validate
+        /* validate  */
 		if($count != null && $count > 100) throw new TwitterException('Count may not be greater than 100.');
 
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($count != null) $parameters['count'] = (int) $count;
 		if($trimUser) $parameters['trim_user'] = 'true';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('statuses/retweets/' . $id . '.json', $parameters);
 	}
 
@@ -1250,17 +1250,17 @@
 	 */
 	public function statusesIdRetweetedBy($id, $count = null, $page = null, $trimUser = false, $includeEntities = false)
 	{
-		// validate
+        /* validate */
 		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
-		// build parameters
+        /* build parameters */
 		$parameters = null;
 		if($count != null) $parameters['count'] = (int) $count;
 		if($page != null) $parameters['page'] = (int) $page;
 		if($trimUser) $parameters['trim_user'] = 'true';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('statuses/' . (string) $id . '/retweeted_by.json', $parameters, true);
 	}
 
@@ -1277,43 +1277,43 @@
 	 */
 	public function statusesIdRetweetedByIds($id, $count = null, $page = null, $trimUser = false, $includeEntities = false)
 	{
-		// validate
+        /* validate  */
 		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($count != null) $parameters['count'] = (int) $count;
 		if($page != null) $parameters['page'] = (int) $page;
 		if($trimUser) $parameters['trim_user'] = 'true';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('statuses/' . (string) $id . '/retweeted_by/ids.json', $parameters, true);
 	}
 
 
-// User resources
-	/**
-	 * Returns extended information of a given user, specified by ID or screen name as per the required id parameter.
-	 * The author's most recent status will be returned inline.
-	 *
-	 * @return	array
-	 * @param	string[optional] $userId			Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-	 * @param	string[optional] $screenName		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
+    /* User resources*/
+     /**
+      * Returns extended information of a given user, specified by ID or screen name as per the required id parameter.
+      * The author's most recent status will be returned inline.
+      *
+      * @return	array
+      * @param	string[optional] $userId			Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+      * @param	string[optional] $screenName		Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+      * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+      */
 	public function usersShow($userId = null, $screenName = null, $includeEntities = false)
 	{
-		// validate
+        /* validate  */
 		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
 
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($userId != null) $parameters['user_id'] = (string) $userId;
 		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('users/show.json', $parameters);
 	}
 
@@ -1329,20 +1329,20 @@
 	 */
 	public function usersLookup($userIds = null, $screenNames = null, $includeEntities = false)
 	{
-		// redefine
+        /* redefine */
 		$userIds = (array) $userIds;
 		$screenNames = (array) $screenNames;
 
-		// validate
+        /* validate */
 		if(empty($userIds) && empty($screenNames)) throw new TwitterException('Specify an userId or a screenName.');
 
-		// build parameters
+        /* build parameters */
 		$parameters = null;
 		if(!empty($userIds)) $parameters['user_id'] = implode(',', $userIds);
 		if(!empty($screenNames)) $parameters['screen_name'] = implode(',', $screenNames);
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('users/lookup.json', $parameters, true);
 
 	}
@@ -1360,13 +1360,13 @@
 	 */
 	public function usersSearch($q, $perPage = null, $page = null, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters['q'] = (string) $q;
 		if($perPage != null) $parameters['per_page'] = (int) $perPage;
 		if($page != null) $parameters['page'] = (int) $page;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call   */
 		return (array) $this->doCall('users/search.json', $parameters, true);
 	}
 
@@ -1407,21 +1407,21 @@
 	 */
 	public function usersProfileImage($screenName, $size = 'normal')
 	{
-		// possible modes
+        /* possible modes */
 		$allowedSizes = array('normal', 'bigger', 'mini');
 
-		// validate
+        /* validate   */
 		if($size != null && !in_array($size, $allowedSizes)) throw new TwitterException('Invalid size (' . $size . '), possible values are: ' . implode($allowedSizes) . '.');
 
-		// build parameters
+        /* build parameters */
 		$parameters['size'] = (string) $size;
 
 		$headers = $this->doCall('users/profile_image/' . (string) $screenName . '.json', $parameters, false, 'GET', null, false, true);
 
-		// return the URL
+        /* return the URL */
 		if(isset($headers['url'])) return $headers['url'];
 
-		// fallback
+        /* fallback  */
 		return false;
 	}
 
@@ -1442,14 +1442,14 @@
 	 */
 	public function statusesFriends($userId = null, $screenName = null, $cursor = null, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters = array();
 		if($userId != null) $parameters['user_id'] = (string) $userId;
 		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
 		if($cursor != null) $parameters['cursor'] = $cursor;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('statuses/friends.json', $parameters, true);
 	}
 
@@ -1466,25 +1466,25 @@
 	 */
 	public function statusesFollowers($userId = null, $screenName = null, $cursor = null, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters */
 		$parameters = array();
 		if($userId != null) $parameters['user_id'] = (string) $userId;
 		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
 		if($cursor != null) $parameters['cursor'] = $cursor;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('statuses/followers.json', $parameters, true);
 	}
 
 
-// Trends resources
-	/**
-	 * Returns the top ten topics that are currently trending on Twitter.
-	 * The response includes the time of the request, the name of each trend, and the url to the Twitter Search results page for that topic.
-	 *
-	 * @return	array
-	 */
+    /* Trends resources  */
+     /**
+      * Returns the top ten topics that are currently trending on Twitter.
+      * The response includes the time of the request, the name of each trend, and the url to the Twitter Search results page for that topic.
+      *
+      * @return	array
+      */
 	public function trends()
 	{
 		return (array) $this->doCall('trends.json');
@@ -1499,11 +1499,11 @@
 	 */
 	public function trendsCurrent($exclude = null)
 	{
-		// build parameters
+        /* build parameters */
 		$parameters = null;
 		if($exclude != null) $parameters['exclude'] = (string) $exclude;
 
-		// make the call
+        /* make the call   */
 		return (array) $this->doCall('trends/current.json', $parameters);
 	}
 
@@ -1517,12 +1517,12 @@
 	 */
 	public function trendsDaily($date = null, $exclude = null)
 	{
-		// build parameters
+        /* build parameters */
 		$parameters = null;
 		if($date != null) $parameters['date'] = (string) $date;
 		if($exclude != null) $parameters['exclude'] = (string) $exclude;
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('trends/daily.json', $parameters);
 	}
 
@@ -1536,57 +1536,57 @@
 	 */
 	public function trendsWeekly($date = null, $exclude = null)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($date != null) $parameters['date'] = (string) $date;
 		if($exclude != null) $parameters['exclude'] = (string) $exclude;
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('trends/weekly.json', $parameters);
 	}
 
 
-// List resources
-	/**
-	 * Creates a new list for the authenticated user. Accounts are limited to 20 lists.
-	 *
-	 * @return	array
-	 * @param	string $user					The user.
-	 * @param	string $name					The name of the list you are creating.
-	 * @param	string[optional] $mode			Whether your list is public or private. Values can be public or private. Lists are public by default if no mode is specified.
-	 * @param	string[optional] $description	The description of the list you are creating.
-	 */
+    /* List resources */
+     /**
+      * Creates a new list for the authenticated user. Accounts are limited to 20 lists.
+      *
+      * @return	array
+      * @param	string $user					The user.
+      * @param	string $name					The name of the list you are creating.
+      * @param	string[optional] $mode			Whether your list is public or private. Values can be public or private. Lists are public by default if no mode is specified.
+      * @param	string[optional] $description	The description of the list you are creating.
+      */
 	public function userListsCreate($user, $name, $mode = null, $description = null)
 	{
-		// possible modes
+        /* possible modes  */
 		$allowedModes = array('public', 'private');
 
-		// validate
+        /* validate   */
 		if($mode != null && !in_array($mode, $allowedModes)) throw new TwitterException('Invalid mode (), possible values are: ' . implode($allowedModes) . '.');
 
-		// build parameters
+        /* build parameters */
 		$parameters['name'] = (string) $name;
 		if($mode != null) $parameters['mode'] = (string) $mode;
 		if($description != null) $parameters['description'] = (string) $description;
 
-		// make the call
-		return (array) $this->doCall((string) $user . '/lists.json', $parameters, true, 'POST');
-	}
+        /* make the call  */
+          return (array) $this->doCall((string) $user . '/lists.json', $parameters, true, 'POST');
+      }
 
 
-	/**
-	 * List the lists of the specified user. Private lists will be included if the authenticated users is the same as the user who's lists are being returned.
-	 *
-	 * @return	array
-	 * @param	string $user				The user.
-	 * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-	 */
+      /**
+       * List the lists of the specified user. Private lists will be included if the authenticated users is the same as the user who's lists are being returned.
+       *
+       * @return	array
+       * @param	string $user				The user.
+       * @param	string[optional] $cursor	Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+       */
 	public function userLists($user, $cursor = null)
 	{
 		$parameters = null;
 		if($cursor != null) $parameters['cursor'] = (string) $cursor;
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall((string) $user . '/lists.json', $parameters, true);
 	}
 
@@ -1600,7 +1600,7 @@
 	 */
 	public function userListsId($user, $id)
 	{
-		// make the call
+        /* make the call   */
 		return (array) $this->doCall((string) $user . '/lists/' . (string) $id . '.json', null, true);
 	}
 
@@ -1617,18 +1617,18 @@
 	 */
 	public function userListsIdUpdate($user, $id, $name = null, $mode = null, $description = null)
 	{
-		// possible modes
+        /* possible modes   */
 		$allowedModes = array('public', 'private');
 
-		// validate
+        /* validate  */
 		if($mode != null && !in_array($mode, $allowedModes)) throw new TwitterException('Invalid mode (), possible values are: ' . implode($allowedModes) . '.');
 
-		// build parameters
+        /* build parameters  */
 		if($name != null) $parameters['name'] = (string) $name;
 		if($mode != null) $parameters['mode'] = (string) $mode;
 		if($description != null) $parameters['description'] = (string) $description;
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall((string) $user . '/lists/' . (string) $id . '.json', $parameters, true, 'POST');
 	}
 
@@ -1647,10 +1647,10 @@
 	 */
 	public function userListsIdStatuses($user, $id, $sinceId = null, $maxId = null, $count = null, $page = null, $includeEntities = false)
 	{
-		// validate
+        /* validate */
 		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
-		// build parameters
+        /* build parameters */
 		$parameters = array();
 		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
 		if($maxId != null) $parameters['max_id'] = (string) $maxId;
@@ -1658,7 +1658,7 @@
 		if($page != null) $parameters['page'] = (int) $page;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall((string) $user . '/lists/' . (string) $id . '/statuses.json', $parameters);
 	}
 
@@ -1672,11 +1672,11 @@
 	 */
 	public function userListsMemberships($user, $cursor = null)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($cursor != null) $parameters['cursor'] = (string) $cursor;
 
-		// make the call
+        /* make the call   */
 		return (array) $this->doCall((string) $user . '/lists/memberships.json', $parameters, true);
 	}
 
@@ -1690,16 +1690,16 @@
 	 */
 	public function userListsSubscriptions($user, $cursor = null)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($cursor != null) $parameters['cursor'] = (string) $cursor;
 
-		// make the call
+        /* make the call   */
 		return (array) $this->doCall((string) $user . '/lists/subscriptions.json', $parameters, true);
 	}
 
 
-// List Members resources
+    /* List Members resources    */
 	/**
 	 * Returns the members of the specified list.
 	 *
@@ -1711,12 +1711,12 @@
 	 */
 	public function userListMembers($user, $id, $cursor = null, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters */
 		$parameters = null;
 		if($cursor != null) $parameters['cursor'] = (string) $cursor;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall((string) $user . '/' . (string) $id . '/members.json', $parameters, true);
 	}
 
@@ -1731,10 +1731,10 @@
 	 */
 	public function userListMembersCreate($user, $id, $userId)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters['id'] = (string) $userId;
 
-		// make the call
+        /* make the call   */
 		return (array) $this->doCall((string) $user . '/' . (string) $id . '/members.json', $parameters, true, 'POST');
 	}
 
@@ -1750,19 +1750,19 @@
 	 */
 	public function userListMembersCreateAll($user, $id, $userIds = null, $screenNames = null)
 	{
-		// redefine
+        /* redefine   */
 		$userIds = (array) $userIds;
 		$screenNames = (array) $screenNames;
 
-		// validate
+        /* validate  */
 		if(empty($userIds) && empty($screenNames)) throw new TwitterException('Specify an userId or a screenName.');
 
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if(!empty($userIds)) $parameters['user_id'] = implode(',', $userIds);
 		if(!empty($screenNames)) $parameters['screen_name'] = implode(',', $screenNames);
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall((string) $user . '/' . (string) $id . '/create_all.json', $parameters, true, 'POST');
 	}
 
@@ -1777,11 +1777,11 @@
 	 */
 	public function userListMembersDelete($user, $id, $userId)
 	{
-		// build parameters
+        /* build parameters */
 		$parameters['id'] = (string) $userId;
 		$parameters['_method'] = 'DELETE';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall((string) $user . '/' . (string) $id . '/members.json', $parameters, true, 'POST');
 	}
 
@@ -1799,15 +1799,15 @@
 	{
 		try
 		{
-			// build parameters
+            /* build parameters  */
 			$parameters = null;
 			if($includeEntities) $parameters['include_entities'] = 'true';
 
-			// make the call
+            /* make the call  */
 			return (array) $this->doCall((string) $user . '/' . (string) $id . '/members/' . (string) $userId . '.json', $parameters, true);
 		}
 
-		// catch exceptions
+            /* catch exceptions */
 		catch(TwitterException $e)
 		{
 			if($e->getMessage() == 'The specified user is not a member of this list') return false;
@@ -1816,7 +1816,7 @@
 	}
 
 
-// List Subscribers resources
+    /* List Subscribers resources  */
 	/**
 	 * Returns the subscribers of the specified list.
 	 *
@@ -1828,12 +1828,12 @@
 	 */
 	public function userListSubscribers($user, $id, $cursor = null, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($cursor != null) $parameters['cursor'] = (string) $cursor;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall((string) $user . '/' . (string) $id . '/subscribers.json', $parameters, true);
 	}
 
@@ -1847,7 +1847,7 @@
 	 */
 	public function userListSubscribersCreate($user, $id)
 	{
-		// make the call
+        /* make the call   */
 		return (array) $this->doCall((string) $user . '/' . (string) $id . '/subscribers.json', null, true, 'POST');
 	}
 
@@ -1861,10 +1861,10 @@
 	 */
 	public function userListSubscribersDelete($user, $id)
 	{
-		// build parameters
+        /* build parameters */
 		$parameters['_method'] = 'DELETE';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall((string) $user . '/' . (string) $id . '/subscribers.json', $parameters, true, 'POST');
 	}
 
@@ -1882,15 +1882,15 @@
 	{
 		try
 		{
-			// build parameters
+            /* build parameters  */
 			$parameters = null;
 			if($includeEntities) $parameters['include_entities'] = 'true';
 
-			// make the call
+            /* make the call  */
 			return (array) $this->doCall((string) $user . '/' . (string) $id . '/subscribers/' . (string) $userId . '.json', $parameters, true);
 		}
 
-		// catch exceptions
+            /* catch exceptions */
 		catch(TwitterException $e)
 		{
 			if($e->getMessage() == 'The specified user is not a subscriber of this list') return false;
@@ -1900,23 +1900,23 @@
 	}
 
 
-// Direct Messages resources
-	/**
-	 * Returns a list of the 20 most recent direct messages sent to the authenticating user.
-	 *
-	 * @return	array
-	 * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
-	 * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
-	 * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
+    /* Direct Messages resources
+
+      * Returns a list of the 20 most recent direct messages sent to the authenticating user.
+      *
+      * @return	array
+      * @param	string[optional] $sinceId			Returns results with an ID greater than (that is, more recent than) the specified ID.
+      * @param	string[optional] $maxId				Returns results with an ID less than (that is, older than) or equal to the specified ID.
+      * @param	int[optional] $count				Specifies the number of records to retrieve. May not be greater than 200.
+      * @param	int[optional] $page					Specifies the page of results to retrieve.
+      * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+      */
 	public function directMessages($sinceId = null, $maxId = null, $count = null, $page = null, $includeEntities = false)
 	{
-		// validate
+        /* validate */
 		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
-		// build parameters
+        /* build parameters  */
 		$parameters = array();
 		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
 		if($maxId != null) $parameters['max_id'] = (string) $maxId;
@@ -1924,7 +1924,7 @@
 		if($page != null) $parameters['page'] = (int) $page;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('direct_messages.json', $parameters, true);
 	}
 
@@ -1941,10 +1941,10 @@
 	 */
 	public function directMessagesSent($sinceId = null, $maxId = null, $count = null, $page = null, $includeEntities = false)
 	{
-		// validate
+        /* validate   */
 		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
-		// build parameters
+        /* build parameters  */
 		$parameters = array();
 		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
 		if($maxId != null) $parameters['max_id'] = (string) $maxId;
@@ -1952,7 +1952,7 @@
 		if($page != null) $parameters['page'] = (int) $page;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('direct_messages/sent.json', $parameters, true);
 	}
 
@@ -1969,16 +1969,16 @@
 	 */
 	public function directMessagesNew($text, $userId = null, $screenName = null, $includeEntities = false)
 	{
-		// validate
+        /* validate */
 		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
 
-		// build parameters
+        /* build parameters */
 		$parameters['text'] = (string) $text;
 		if($userId != null) $parameters['user_id'] = (string) $userId;
 		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('direct_messages/new.json', $parameters, true, 'POST');
 	}
 
@@ -1992,16 +1992,16 @@
 	 */
 	public function directMessagesDestroy($id, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters */
 		$parameters['id'] = (string) $id;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('direct_messages/destroy.json', $parameters, true, 'POST');
 	}
 
 
-// Friendship resources
+    /* Friendship resources   */
 	/**
 	 * Allows the authenticating users to follow the user specified in the ID parameter.
 	 * Returns the befriended user in the requested format when successful.
@@ -2015,17 +2015,17 @@
 	 */
 	public function friendshipsCreate($userId = null, $screenName = null, $follow = false, $includeEntities = false)
 	{
-		// validate
+        /* validate  */
 		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
 
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($userId != null) $parameters['user_id'] = (string) $userId;
 		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
 		$parameters['follow'] = ($follow) ? 'true' : 'false';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('friendships/create.json', $parameters, true, 'POST');
 	}
 
@@ -2041,15 +2041,15 @@
 	 */
 	public function friendshipsDestroy($userId = null, $screenName = null, $includeEntities = false)
 	{
-		// validate
+        /* validate */
 		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
 
-		// build parameters
+        /* build parameters  */
 		if($userId != null) $parameters['user_id'] = (string) $userId;
 		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('friendships/destroy.json', $parameters, true, 'POST');
 	}
 
@@ -2063,11 +2063,11 @@
 	 */
 	public function friendshipsExists($userA, $userB)
 	{
-		// build parameters
+        /* build parameters */
 		$parameters['user_a'] = (string) $userA;
 		$parameters['user_b'] = (string) $userB;
 
-		// make the call
+        /* make the call  */
 		return (bool) $this->doCall('friendships/exists.json', $parameters);
 	}
 
@@ -2083,17 +2083,17 @@
 	 */
 	public function friendshipsShow($sourceId = null, $sourceScreenName = null, $targetId = null, $targetScreenName = null)
 	{
-		// validate
+        /* validate */
 		if($sourceId == '' && $sourceScreenName == '') throw new TwitterException('Specify an sourceId or a sourceScreenName.');
 		if($targetId == '' && $targetScreenName == '') throw new TwitterException('Specify an targetId or a targetScreenName.');
 
-		// build parameters
+        /* build parameters */
 		if($sourceId != null) $parameters['source_id'] = (string) $sourceId;
 		if($sourceScreenName != null) $parameters['source_screen_name'] = (string) $sourceScreenName;
 		if($targetId != null) $parameters['target_id'] = (string) $targetId;
 		if($targetScreenName != null) $parameters['target_screen_name'] = (string) $targetScreenName;
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('friendships/show.json', $parameters);
 	}
 
@@ -2106,11 +2106,11 @@
 	 */
 	public function friendshipsIncoming($cursor = null)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($cursor != null) $parameters['cursor'] = (string) $cursor;
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('friendships/incoming.json', $parameters, true);
 	}
 
@@ -2123,16 +2123,16 @@
 	 */
 	public function friendshipsOutgoing($cursor = null)
 	{
-		// build parameters
+        /* build parameters */
 		$parameters = null;
 		if($cursor != null) $parameters['cursor'] = (string) $cursor;
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('friendships/outgoing.json', $parameters, true);
 	}
 
 
-// Friends and Followers resources
+    /* Friends and Followers resources  */
 	/**
 	 * Returns an array of numeric IDs for every user the specified user is following.
 	 *
@@ -2143,16 +2143,16 @@
 	 */
 	public function friendsIds($userId = null, $screenName = null, $cursor = null)
 	{
-		// validate
+        /* validate */
 		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
 
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($userId != null) $parameters['user_id'] = (string) $userId;
 		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
 		if($cursor != null) $parameters['cursor'] = (string) $cursor;
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('friends/ids.json', $parameters, true);
 	}
 
@@ -2167,20 +2167,20 @@
 	 */
 	public function followersIds($userId = null, $screenName = null, $cursor = null)
 	{
-		// validate
+        /* validate  */
 		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
 
-		// build parameters
+        /* build parameters */
 		if($userId != null) $parameters['user_id'] = (string) $userId;
 		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
 		if($cursor != null) $parameters['cursor'] = (string) $cursor;
 
-		// make the call
+        /* make the call   */
 		return (array) $this->doCall('followers/ids.json', $parameters, true);
 	}
 
 
-// Account resources
+    /* Account resources   */
 	/**
 	 * Returns an HTTP 200 OK response code and a representation of the requesting user if authentication was successful; returns a 401 status code and an error message if not. Use this method to test if supplied user credentials are valid.
 	 *
@@ -2189,11 +2189,11 @@
 	 */
 	public function accountVerifyCredentials($includeEntities = false)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('account/verify_credentials.json', $parameters, true);
 	}
 
@@ -2206,7 +2206,7 @@
 	 */
 	public function accountRateLimitStatus()
 	{
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('account/rate_limit_status.json', null);
 	}
 
@@ -2220,11 +2220,11 @@
 	{
 		try
 		{
-			// make the call
+            /* make the call  */
 			$this->doCall('account/end_session.json', null, true, 'POST');
 		}
 
-		// catch exceptions
+            /* catch exceptions */
 		catch(TwitterException $e)
 		{
 			if($e->getMessage() == 'Logged out.') return true;
@@ -2242,11 +2242,11 @@
 	 */
 	public function accountUpdateDeliveryDevices($device, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters['device'] = (string) $device;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('account/update_delivery_device.json', $parameters, true, 'POST');
 	}
 
@@ -2265,10 +2265,10 @@
 	 */
 	public function accountUpdateProfileColors($profileBackgroundColor = null, $profileTextColor = null, $profileLinkColor = null, $profileSidebarFillColor = null, $profileSidebarBorderColor = null, $includeEntities = false)
 	{
-		// validate
+        /* validate  */
 		if($profileBackgroundColor == '' && $profileTextColor == '' && $profileLinkColor == '' && $profileSidebarFillColor == '' && $profileSidebarBorderColor == '') throw new TwitterException('Specify a profileBackgroundColor, profileTextColor, profileLinkColor, profileSidebarFillColor or a profileSidebarBorderColor.');
 
-		// build parameters
+        /* build parameters  */
 		if($profileBackgroundColor != null) $parameters['profile_background_color'] = (string) $profileBackgroundColor;
 		if($profileTextColor != null) $parameters['profile_text_color'] = (string) $profileTextColor;
 		if($profileLinkColor != null) $parameters['profile_link_color'] = (string) $profileLinkColor;
@@ -2276,7 +2276,7 @@
 		if($profileSidebarBorderColor != null) $parameters['profile_sidebar_border_color'] = (string) $profileSidebarBorderColor;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('account/update_profile_colors.json', $parameters, true, 'POST');
 	}
 
@@ -2290,14 +2290,14 @@
 	 */
 	public function accountUpdateProfileImage($image, $includeEntities = false)
 	{
-		// validate
+        /* validate  */
 		if(!file_exists($image)) throw new TwitterException('Image (' . $image . ') doesn\'t exists.');
 
-		// build parameters
+        /* build parameters */
 		$parameters = null;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('account/update_profile_image.json', $parameters, true, 'POST', $image);
 	}
 
@@ -2312,15 +2312,15 @@
 	 */
 	public function accountUpdateProfileBackgroundImage($image, $tile = false, $includeEntities = false)
 	{
-		// validate
+        /* validate */
 		if(!file_exists($image)) throw new TwitterException('Image (' . $image . ') doesn\'t exists.');
 
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($tile) $parameters['tile'] = 'true';
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('account/update_profile_background_image.json', $parameters, true, 'POST', $image);
 	}
 
@@ -2337,7 +2337,7 @@
 	 */
 	public function accountUpdateProfile($name = null, $url = null, $location = null, $description = null, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($name != null) $parameters['name'] = (string) $name;
 		if($url != null) $parameters['url'] = (string) $url;
@@ -2345,29 +2345,29 @@
 		if($description != null) $parameters['description'] = (string) $description;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('account/update_profile.json', $parameters, true, 'POST');
 	}
 
 
-// Favorites resources
-	/**
-	 * Returns the 20 most recent favorite statuses for the authenticating user or user specified by the ID parameter in the requested format.
-	 *
-	 * @return	array
-	 * @param	string[optional] $id				Specifies the ID or screen name of the user for whom to return results for.
-	 * @param	int[optional] $page					Specifies the page of results to retrieve.
-	 * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
-	 */
+    /* Favorites resources    */
+     /**
+      * Returns the 20 most recent favorite statuses for the authenticating user or user specified by the ID parameter in the requested format.
+      *
+      * @return	array
+      * @param	string[optional] $id				Specifies the ID or screen name of the user for whom to return results for.
+      * @param	int[optional] $page					Specifies the page of results to retrieve.
+      * @param	bool[optional] $includeEntities		When set to true each tweet will include a node called "entities,". This node offers a variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+      */
 	public function favorites($id = null, $page = null, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($id != null) $parameters['id'] = (string) $id;
 		if($page != null) $parameters['page'] = (int) $page;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('favorites.json', $parameters, true);
 	}
 
@@ -2381,11 +2381,11 @@
 	 */
 	public function favoritesCreate($id, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters */
 		$parameters = null;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('favorites/create/' . $id . '.json', $parameters, true, 'POST');
 	}
 
@@ -2399,16 +2399,16 @@
 	 */
 	public function favoritesDestroy($id, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('favorites/destroy/' . $id . '.json', $parameters, true, 'POST');
 	}
 
 
-// Notification resources
+    /* Notification resources  */
 	/**
 	 * Enables device notifications for updates from the specified user. Returns the specified user when successful.
 	 *
@@ -2419,15 +2419,15 @@
 	 */
 	public function notificationsFollow($userId = null, $screenName = null, $includeEntities = false)
 	{
-		// validate
+        /* validate  */
 		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
 
-		// build parameters
+        /* build parameters  */
 		if($userId != null) $parameters['user_id'] = (string) $userId;
 		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('notifications/follow.json', $parameters, true, 'POST');
 	}
 
@@ -2442,20 +2442,20 @@
 	 */
 	public function notificationsLeave($userId = null, $screenName = null, $includeEntities = false)
 	{
-		// validate
+        /* validate  */
 		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
 
-		// build parameters
+        /* build parameters */
 		if($userId != null) $parameters['user_id'] = (string) $userId;
 		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call   */
 		return (array) $this->doCall('notifications/leave.json', $parameters, true, 'POST');
 	}
 
 
-// Block resources
+    /* Block resources  */
 	/**
 	 * Blocks the user specified in the ID parameter as the authenticating user. Destroys a friendship to the blocked user if it exists. Returns the blocked user in the requested format when successful.
 	 *
@@ -2466,15 +2466,15 @@
 	 */
 	public function blocksCreate($userId = null, $screenName = null, $includeEntities = false)
 	{
-		// validate
+        /* validate  */
 		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
 
-		// build parameters
+        /* build parameters */
 		if($userId != null) $parameters['user_id'] = (string) $userId;
 		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call   */
 		return (array) $this->doCall('blocks/create.json', $parameters, true, 'POST');
 	}
 
@@ -2489,15 +2489,15 @@
 	 */
 	public function blocksDestroy($userId = null, $screenName = null, $includeEntities = false)
 	{
-		// validate
+        /* validate  */
 		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
 
-		// build parameters
+        /* build parameters */
 		if($userId != null) $parameters['user_id'] = (string) $userId;
 		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call   */
 		return (array) $this->doCall('blocks/destroy.json', $parameters, true, 'POST');
 	}
 
@@ -2512,20 +2512,20 @@
 	 */
 	public function blocksExists($userId = null, $screenName = null, $includeEntities = false)
 	{
-		// validate
+        /* validate  */
 		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
 
-		// build parameters
+        /* build parameters */
 		if($userId != null) $parameters['user_id'] = (string) $userId;
 		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
 		try
 		{
-			// make the call
+            /* make the call  */
 			return (array) $this->doCall('blocks/exists.json', $parameters, true);
 		}
-		// catch exceptions
+            /* catch exceptions  */
 		catch(TwitterException $e)
 		{
 			if($e->getMessage() == 'You are not blocking this user.') return false;
@@ -2543,12 +2543,12 @@
 	 */
 	public function blocksBlocking($page = null, $includeEntities = false)
 	{
-		// build parameters
+        /* build parameters */
 		$parameters = null;
 		if($page != null) $parameters['page'] = (int) $page;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('blocks/blocking.json', $parameters, true);
 	}
 
@@ -2560,12 +2560,12 @@
 	 */
 	public function blocksBlockingIds()
 	{
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('blocks/blocking/ids.json', null, true);
 	}
 
 
-// Spam Reporting resources
+    /* Spam Reporting resources  */
 	/**
 	 * The user specified in the id is blocked by the authenticated user and reported as a spammer.
 	 *
@@ -2576,20 +2576,20 @@
 	 */
 	public function reportSpam($userId = null, $screenName = null, $includeEntities = false)
 	{
-		// validate
+        /* validate  */
 		if($userId == '' && $screenName == '') throw new TwitterException('Specify an userId or a screenName.');
 
-		// build parameters
+        /* build parameters  */
 		if($userId != null) $parameters['user_id'] = (string) $userId;
 		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
 		if($includeEntities) $parameters['include_entities'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('report_spam.json', $parameters, true, 'POST');
 	}
 
 
-// Search resources
+    /* Search resources  */
 	/**
 	 * Returns tweets that match a specified query.
 	 *
@@ -2622,7 +2622,7 @@
 	}
 
 
-// Saved Searches resources
+    /* Saved Searches resources */
 	/**
 	 * Returns the authenticated user's saved search queries.
 	 *
@@ -2630,7 +2630,7 @@
 	 */
 	public function savedSearches()
 	{
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('saved_searches.json', null, true);
 	}
 
@@ -2643,7 +2643,7 @@
 	 */
 	public function savedSearchesShow($id)
 	{
-		// make the call
+        /* make the call    */
 		return (array) $this->doCall('saved_searches/show/' . (string) $id . '.json', null, true);
 	}
 
@@ -2656,10 +2656,10 @@
 	 */
 	public function savedSearchesCreate($query)
 	{
-		// build parameters
+        /* build parameters   */
 		$parameters['query'] = (string) $query;
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('saved_searches/create.json', $parameters, true, 'POST');
 	}
 
@@ -2676,7 +2676,7 @@
 	}
 
 
-// OAuth resources
+    /* OAuth resources     */
 	/**
 	 * Allows a Consumer application to obtain an OAuth Request Token to request user authorization.
 	 * This method fulfills Secion 6.1 of the OAuth 1.0 authentication flow.
@@ -2686,23 +2686,23 @@
 	 */
 	public function oAuthRequestToken($callbackURL = null)
 	{
-		// init var
+        /* init var   */
 		$parameters = null;
 
-		// set callback
+        /* set callback */
 		if($callbackURL != null) $parameters['oauth_callback'] = (string) $callbackURL;
 
-		// make the call
+        /* make the call  */
 		$response = $this->doOAuthCall('request_token', $parameters);
 
-		// validate
+        /* validate  */
 		if(!isset($response['oauth_token'], $response['oauth_token_secret'])) throw new TwitterException(implode(', ', array_keys($response)));
 
-		// set some properties
+        /* set some properties  */
 		if(isset($response['oauth_token'])) $this->setOAuthToken($response['oauth_token']);
 		if(isset($response['oauth_token_secret'])) $this->setOAuthTokenSecret($response['oauth_token_secret']);
 
-		// return
+        /* return   */
 		return $response;
 	}
 
@@ -2717,19 +2717,19 @@
 	 */
 	public function oAuthAccessToken($token, $verifier)
 	{
-		// init var
+        /* init var   */
 		$parameters = array();
 		$parameters['oauth_token'] = (string) $token;
 		$parameters['oauth_verifier'] = (string) $verifier;
 
-		// make the call
+        /* make the call */
 		$response = $this->doOAuthCall('access_token', $parameters);
 
-		// set some properties
+        /* set some properties  */
 		if(isset($response['oauth_token'])) $this->setOAuthToken($response['oauth_token']);
 		if(isset($response['oauth_token_secret'])) $this->setOAuthTokenSecret($response['oauth_token_secret']);
 
-		// return
+        /* return  */
 		return $response;
 	}
 
@@ -2757,16 +2757,16 @@
 	{
 		throw new TwitterException('Not implemented');
 
-		// build parameters
+        /* build parameters */
 		$parameters = null;
 		if((bool) $force) $parameters['force_login'] = 'true';
 
-		// make the call
+        /* make the call  */
 		return $this->doCall('/oauth/authenticate.oauth', $parameters);
 	}
 
 
-// Local Trends resources
+    /* Local Trends resources  */
 	/**
 	 * Returns the locations that Twitter has trending topic information for.
 	 * The response is an array of "locations" that encode the location's WOEID (a Yahoo! Where On Earth ID) and some other human-readable information such as a canonical name and country the location belongs in.
@@ -2778,12 +2778,12 @@
 	 */
 	public function trendsAvailable($lat = null, $long = null)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($lat != null) $parameters['lat_for_trends'] = (float) $lat;
 		if($long != null) $parameters['long_for_trends'] = (float) $long;
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('trends/available.json', $parameters);
 	}
 
@@ -2798,31 +2798,31 @@
 	 */
 	public function trendsLocation($woeid)
 	{
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('trends/' . (string) $woeid . '.json');
 	}
 
 
-// Geo resources
-	/**
-	 * Search for places that can be attached to a statuses/update. Given a latitude and a longitude pair, an IP address, or a name, this request will return a list of all the valid places that can be used as the place_id when updating a status.
-	 * Conceptually, a query can be made from the user's location, retrieve a list of places, have the user validate the location he or she is at, and then send the ID of this location with a call to statuses/update.
-	 * This is the recommended method to use find places that can be attached to statuses/update. Unlike geo/reverse_geocode which provides raw data access, this endpoint can potentially re-order places with regards to the user who is authenticated. This approach is also preferred for interactive place matching with the user.
-	 *
-	 * @return	array
-	 * @param	float[optional] $lat				The latitude to search around. This parameter will be ignored unless it is inside the range -90.0 to +90.0 (North is positive) inclusive. It will also be ignored if there isn't a corresponding long parameter.
-	 * @param	float[optional] $long				The longitude to search around. The valid ranges for longitude is -180.0 to +180.0 (East is positive) inclusive. This parameter will be ignored if outside that range, if it is not a number, if geo_enabled is disabled, or if there not a corresponding lat parameter.
-	 * @param	string[optional] $query				Free-form text to match against while executing a geo-based query, best suited for finding nearby locations by name.
-	 * @param	string[optional] $ip				An IP address. Used when attempting to fix geolocation based off of the user's IP address.
-	 * @param	string[optional] $accuracy			A hint on the "region" in which to search. If a number, then this is a radius in meters, but it can also take a string that is suffixed with ft to specify feet. If this is not passed in, then it is assumed to be 0m. If coming from a device, in practice, this value is whatever accuracy the device has measuring its location (whether it be coming from a GPS, WiFi triangulation, etc.).
-	 * @param	string[optional] $granularity		The minimal granularity of data to return. If this is not passed in, then neighborhood is assumed. city can also be passed.
-	 * @param	int[optional] $maxResults			A hint as to the number of results to return. This does not guarantee that the number of results returned will equal max_results, but instead informs how many "nearby" results to return. Ideally, only pass in the number of places you intend to display to the user here.
-	 * @param	string[optional] $containedWithin	This is the place_id which you would like to restrict the search results to. Setting this value means only places within the given place_id will be found.
-	 * @param	array[optional] $attributes			This parameter searches for places which have this given. This should be an key-value-pair-array.
-	 */
+    /* Geo resources
+     /**
+      * Search for places that can be attached to a statuses/update. Given a latitude and a longitude pair, an IP address, or a name, this request will return a list of all the valid places that can be used as the place_id when updating a status.
+      * Conceptually, a query can be made from the user's location, retrieve a list of places, have the user validate the location he or she is at, and then send the ID of this location with a call to statuses/update.
+      * This is the recommended method to use find places that can be attached to statuses/update. Unlike geo/reverse_geocode which provides raw data access, this endpoint can potentially re-order places with regards to the user who is authenticated. This approach is also preferred for interactive place matching with the user.
+      *
+      * @return	array
+      * @param	float[optional] $lat				The latitude to search around. This parameter will be ignored unless it is inside the range -90.0 to +90.0 (North is positive) inclusive. It will also be ignored if there isn't a corresponding long parameter.
+      * @param	float[optional] $long				The longitude to search around. The valid ranges for longitude is -180.0 to +180.0 (East is positive) inclusive. This parameter will be ignored if outside that range, if it is not a number, if geo_enabled is disabled, or if there not a corresponding lat parameter.
+      * @param	string[optional] $query				Free-form text to match against while executing a geo-based query, best suited for finding nearby locations by name.
+      * @param	string[optional] $ip				An IP address. Used when attempting to fix geolocation based off of the user's IP address.
+      * @param	string[optional] $accuracy			A hint on the "region" in which to search. If a number, then this is a radius in meters, but it can also take a string that is suffixed with ft to specify feet. If this is not passed in, then it is assumed to be 0m. If coming from a device, in practice, this value is whatever accuracy the device has measuring its location (whether it be coming from a GPS, WiFi triangulation, etc.).
+      * @param	string[optional] $granularity		The minimal granularity of data to return. If this is not passed in, then neighborhood is assumed. city can also be passed.
+      * @param	int[optional] $maxResults			A hint as to the number of results to return. This does not guarantee that the number of results returned will equal max_results, but instead informs how many "nearby" results to return. Ideally, only pass in the number of places you intend to display to the user here.
+      * @param	string[optional] $containedWithin	This is the place_id which you would like to restrict the search results to. Setting this value means only places within the given place_id will be found.
+      * @param	array[optional] $attributes			This parameter searches for places which have this given. This should be an key-value-pair-array.
+      */
 	public function geoSearch($lat = null, $long = null, $query = null, $ip = null, $accuracy = null, $granularity = null, $maxResults = null, $containedWithin = null, array $attributes = null)
 	{
-		// build parameters
+        /* build parameters  */
 		if($lat != null) $parameters['lat'] = (float) $lat;
 		if($long != null) $parameters['long'] = (float) $long;
 		if($query != null) $parameters['query'] = (string) $query;
@@ -2833,11 +2833,11 @@
 		if($containedWithin != null) $parameters['contained_within'] = (string) $containedWithin;
 		if($attributes != null)
 		{
-			// loop
+            /* loop  */
 			foreach($attributes as $key => $value) $parameters['attribute:' . $key] = (string) $value;
 		}
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('geo/search.json', $parameters);
 	}
 
@@ -2856,18 +2856,18 @@
 	 */
 	public function geoSimilarPlaces($lat, $long, $name, $containedWithin = null, array $attributes = null)
 	{
-		// build parameters
+        /* build parameters */
 		$parameters['lat'] = (float) $lat;
 		$parameters['long'] = (float) $long;
 		$parameters['name'] = (string) $name;
 		if($containedWithin != null) $parameters['contained_within'] = (string) $containedWithin;
 		if($attributes != null)
 		{
-			// loop
+            /* loop */
 			foreach($attributes as $key => $value) $parameters['attribute:' . $key] = (string) $value;
 		}
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('geo/similar_places.json', $parameters);
 	}
 
@@ -2887,14 +2887,14 @@
 	 */
 	public function geoReverseGeoCode($lat, $long, $accuracy = null, $granularity = null, $maxResults = null)
 	{
-		// build parameters
+        /* build parameters */
 		$parameters['lat'] = (float) $lat;
 		$parameters['long'] = (float) $long;
 		if($accuracy != null) $parameters['accuracy'] = (string) $accuracy;
 		if($granularity != null) $parameters['granularity'] = (string) $granularity;
 		if($maxResults != null) $parameters['max_results'] = (int) $maxResults;
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('geo/reverse_geocode.json', $parameters);
 	}
 
@@ -2908,11 +2908,11 @@
 	 */
 	public function geoId($id, $placeId = null)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters = null;
 		if($placeId != null) $parameters['place_id'] = (string) $placeId;
 
-		// make the call
+        /* make the call  */
 		return (array) $this->doCall('geo/id/' . (string) $id . '.json', $parameters);
 	}
 
@@ -2930,7 +2930,7 @@
 	 */
 	public function geoPlaceCreate($name, $containedWithin, $token, $lat, $long, array $attributes = null)
 	{
-		// build parameters
+        /* build parameters  */
 		$parameters['name'] = (string) $name;
 		$parameters['contained_within'] = (string) $containedWithin;
 		$parameters['token'] = (string) $token;
@@ -2938,30 +2938,30 @@
 		$parameters['long'] = (float) $long;
 		if($attributes != null)
 		{
-			// loop
+            /* loop */
 			foreach($attributes as $key => $value) $parameters['attribute:' . $key] = (string) $value;
 		}
 
-		// make the call
+        /* make the call */
 		return (array) $this->doCall('geo/place.json', $parameters, true, 'POST');
 	}
 
 
-// legal resources
-	/**
-	 * Returns Twitter's' Terms of Service in the requested format. These are not the same as the Developer Terms of Service.
-	 *
-	 * @return	string
-	 */
+    /* legal resources
+     /**
+      * Returns Twitter's' Terms of Service in the requested format. These are not the same as the Developer Terms of Service.
+      *
+      * @return	string
+      */
 	public function legalToS()
 	{
-		// make the call
+        /* make the call   */
 		$response = $this->doCall('legal/tos.json');
 
-		// validate and return
+        /* validate and return  */
 		if(isset($response['tos'])) return $response['tos'];
 
-		// fallback
+        /* fallback */
 		return false;
 	}
 
@@ -2973,26 +2973,26 @@
 	 */
 	public function legalPrivacy()
 	{
-		// make the call
+        /* make the call  */
 		$response = $this->doCall('legal/privacy.json');
 
-		// validate and return
+        /* validate and return */
 		if(isset($response['privacy'])) return $response['privacy'];
 
-		// fallback
+        /* fallback    */
 		return false;
 	}
 
 
-// Help resources
-	/**
-	 * Test
-	 *
-	 * @return	bool
-	 */
+    /* Help resources
+     /**
+      * Test
+      *
+      * @return	bool
+      */
 	public function helpTest()
 	{
-		// make the call
+        /* make the call */
 		return ($this->doCall('help/test.json', null, null, 'GET', null, false) == '"ok"');
 	}
 }
