diff --git a/lib/Tmdb/Api/AbstractApi.php b/lib/Tmdb/Api/AbstractApi.php
index 4d12baa2..6a8682a1 100644
--- a/lib/Tmdb/Api/AbstractApi.php
+++ b/lib/Tmdb/Api/AbstractApi.php
@@ -140,4 +140,4 @@ public function patch($path, $body = null, array $parameters = array(), $headers
         $response = $this->client->getHttpClient()->patch($path, $body, $parameters, $headers);
         return $response->json();
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/Account.php b/lib/Tmdb/Api/Account.php
index 34a25c5f..350f3a5b 100644
--- a/lib/Tmdb/Api/Account.php
+++ b/lib/Tmdb/Api/Account.php
@@ -93,4 +93,4 @@ public function watchlist()
     {
         throw new NotImplementedException(__METHOD__ . ' has not been implemented yet.');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/ApiInterface.php b/lib/Tmdb/Api/ApiInterface.php
index 298bc430..45687b38 100644
--- a/lib/Tmdb/Api/ApiInterface.php
+++ b/lib/Tmdb/Api/ApiInterface.php
@@ -13,4 +13,4 @@
 namespace Tmdb\Api;
 
 interface ApiInterface {
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/Authentication.php b/lib/Tmdb/Api/Authentication.php
index 5a744b3b..3552404e 100644
--- a/lib/Tmdb/Api/Authentication.php
+++ b/lib/Tmdb/Api/Authentication.php
@@ -62,4 +62,4 @@ public function getNewGuestSession()
     {
         throw new NotImplementedException(__METHOD__ . ' has not been implemented yet.');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/Changes.php b/lib/Tmdb/Api/Changes.php
index 0045cd30..b572a8f9 100644
--- a/lib/Tmdb/Api/Changes.php
+++ b/lib/Tmdb/Api/Changes.php
@@ -54,4 +54,4 @@ public function getPersonChanges(array $options = array(), array $headers = arra
     {
         return $this->get('person/changes', $options, $headers);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/Collections.php b/lib/Tmdb/Api/Collections.php
index eda6b862..03cac14b 100644
--- a/lib/Tmdb/Api/Collections.php
+++ b/lib/Tmdb/Api/Collections.php
@@ -46,4 +46,4 @@ public function getImages($collection_id, array $options = array(), array $heade
     {
         return $this->get('collection/' . $collection_id . '/images', $options, $headers);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/Companies.php b/lib/Tmdb/Api/Companies.php
index dd19a68a..cda59ab6 100644
--- a/lib/Tmdb/Api/Companies.php
+++ b/lib/Tmdb/Api/Companies.php
@@ -40,4 +40,4 @@ public function getMovies($company_id, array $options = array(), array $headers
     {
         return $this->get('company/' . $company_id . '/movies', $options, $headers);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/Configuration.php b/lib/Tmdb/Api/Configuration.php
index b78528e1..7cdc9e77 100644
--- a/lib/Tmdb/Api/Configuration.php
+++ b/lib/Tmdb/Api/Configuration.php
@@ -39,4 +39,4 @@ public function getConfiguration(array $headers = array())
     {
         return $this->get('configuration', array(), $headers);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/Discover.php b/lib/Tmdb/Api/Discover.php
index d670bd8d..4c3b24eb 100644
--- a/lib/Tmdb/Api/Discover.php
+++ b/lib/Tmdb/Api/Discover.php
@@ -38,4 +38,4 @@ public function discoverTv(array $options = array(), array $headers = array())
     {
         return $this->get('discover/tv', $options, $headers);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/Genres.php b/lib/Tmdb/Api/Genres.php
index b4d4b359..da81d28a 100644
--- a/lib/Tmdb/Api/Genres.php
+++ b/lib/Tmdb/Api/Genres.php
@@ -62,4 +62,4 @@ public function getMovies($genre_id, array $options = array(), array $headers =
     {
         return $this->get('genre/' . $genre_id . '/movies', $options, $headers);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/Jobs.php b/lib/Tmdb/Api/Jobs.php
index b92a065d..59193553 100644
--- a/lib/Tmdb/Api/Jobs.php
+++ b/lib/Tmdb/Api/Jobs.php
@@ -26,4 +26,4 @@ public function getJobs(array $options = array(), array $headers = array())
     {
         return $this->get('job/list', $options, $headers);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/Keywords.php b/lib/Tmdb/Api/Keywords.php
index 43b6a01f..08c69383 100644
--- a/lib/Tmdb/Api/Keywords.php
+++ b/lib/Tmdb/Api/Keywords.php
@@ -40,4 +40,4 @@ public function getMovies($keyword_id, array $options = array(), array $headers
     {
         return $this->get('keyword/' . $keyword_id . '/movies', $options, $headers);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/Lists.php b/lib/Tmdb/Api/Lists.php
index 62592372..a76df68e 100644
--- a/lib/Tmdb/Api/Lists.php
+++ b/lib/Tmdb/Api/Lists.php
@@ -84,4 +84,4 @@ public function deleteList()
     {
         throw new NotImplementedException(__METHOD__ . ' has not been implemented yet.');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/Movies.php b/lib/Tmdb/Api/Movies.php
index eb38c466..ed9022a3 100644
--- a/lib/Tmdb/Api/Movies.php
+++ b/lib/Tmdb/Api/Movies.php
@@ -252,4 +252,4 @@ public function rateMovie()
     {
         throw new NotImplementedException('TMDB account sessions have not been implemented yet!');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/People.php b/lib/Tmdb/Api/People.php
index 11243353..be918a92 100644
--- a/lib/Tmdb/Api/People.php
+++ b/lib/Tmdb/Api/People.php
@@ -96,4 +96,4 @@ public function getLatest(array $options = array(), array $headers = array())
     {
         return $this->get('person/latest', $options, $headers);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/Reviews.php b/lib/Tmdb/Api/Reviews.php
index 24105449..d0289f90 100644
--- a/lib/Tmdb/Api/Reviews.php
+++ b/lib/Tmdb/Api/Reviews.php
@@ -27,4 +27,4 @@ public function getReview($review_id, array $options = array(), array $headers =
     {
         return $this->get('review/' . $review_id, $options, $headers);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/Search.php b/lib/Tmdb/Api/Search.php
index 5764c23a..a71db8b5 100644
--- a/lib/Tmdb/Api/Search.php
+++ b/lib/Tmdb/Api/Search.php
@@ -119,4 +119,4 @@ public function searchKeyword($query, array $options = array(), array $headers =
             'query' => urlencode($query)
         ), $headers));
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/Tv.php b/lib/Tmdb/Api/Tv.php
index e48dc594..b7350963 100644
--- a/lib/Tmdb/Api/Tv.php
+++ b/lib/Tmdb/Api/Tv.php
@@ -95,4 +95,4 @@ public function getTopRated(array $options = array(), array $headers = array())
         return $this->get('tv/top_rated', $options, $headers);
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/TvEpisode.php b/lib/Tmdb/Api/TvEpisode.php
index 74d0e0d7..85716b10 100644
--- a/lib/Tmdb/Api/TvEpisode.php
+++ b/lib/Tmdb/Api/TvEpisode.php
@@ -74,4 +74,4 @@ public function getEpisodeImages($tvshow_id, $season_number, $episode_number, ar
     {
         return $this->get(sprintf('tv/%s/season/%s/episode/%s/images', $tvshow_id, $season_number,$episode_number), $options, $headers);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Api/TvSeason.php b/lib/Tmdb/Api/TvSeason.php
index 8b1666e4..4c7f5539 100644
--- a/lib/Tmdb/Api/TvSeason.php
+++ b/lib/Tmdb/Api/TvSeason.php
@@ -70,4 +70,4 @@ public function getSeasonImages($tvshow_id, $season_number, array $options = arr
     {
         return $this->get(sprintf('tv/%s/season/%s/images', $tvshow_id, $season_number), $options, $headers);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/ApiToken.php b/lib/Tmdb/ApiToken.php
index c71bcd20..9a3343f1 100644
--- a/lib/Tmdb/ApiToken.php
+++ b/lib/Tmdb/ApiToken.php
@@ -42,5 +42,4 @@ public function getApiToken()
     {
         return $this->apiToken;
     }
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Client.php b/lib/Tmdb/Client.php
index a67d7dd6..f84a6d9f 100644
--- a/lib/Tmdb/Client.php
+++ b/lib/Tmdb/Client.php
@@ -306,5 +306,4 @@ public function getSecure()
     {
         return $this->secure;
     }
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Common/ObjectHydrator.php b/lib/Tmdb/Common/ObjectHydrator.php
index bdc387fe..bd9bea0d 100644
--- a/lib/Tmdb/Common/ObjectHydrator.php
+++ b/lib/Tmdb/Common/ObjectHydrator.php
@@ -15,6 +15,12 @@
 use Tmdb\Exception\RuntimeException;
 use Tmdb\Model\AbstractModel;
 
+/**
+ * Utilisation class to hydrate objects.
+ *
+ * Class ObjectHydrator
+ * @package Tmdb\Common
+ */
 class ObjectHydrator {
     /**
      * Hydrate the object with data
diff --git a/lib/Tmdb/Exception/InvalidArgumentException.php b/lib/Tmdb/Exception/InvalidArgumentException.php
index ad304508..c72fcc93 100644
--- a/lib/Tmdb/Exception/InvalidArgumentException.php
+++ b/lib/Tmdb/Exception/InvalidArgumentException.php
@@ -14,4 +14,4 @@
 
 class InvalidArgumentException extends \InvalidArgumentException {
 
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Exception/MissingArgumentException.php b/lib/Tmdb/Exception/MissingArgumentException.php
index 4920e916..6151ade7 100644
--- a/lib/Tmdb/Exception/MissingArgumentException.php
+++ b/lib/Tmdb/Exception/MissingArgumentException.php
@@ -14,4 +14,4 @@
 
 class MissingArgumentException extends \InvalidArgumentException {
 
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Exception/NotImplementedException.php b/lib/Tmdb/Exception/NotImplementedException.php
index 2ce02fcd..14ac20ee 100644
--- a/lib/Tmdb/Exception/NotImplementedException.php
+++ b/lib/Tmdb/Exception/NotImplementedException.php
@@ -14,4 +14,4 @@
 
 class NotImplementedException extends \Exception {
 
-} 
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Exception/RuntimeException.php b/lib/Tmdb/Exception/RuntimeException.php
index 3962054b..1a231bc4 100644
--- a/lib/Tmdb/Exception/RuntimeException.php
+++ b/lib/Tmdb/Exception/RuntimeException.php
@@ -14,4 +14,4 @@
 
 class RuntimeException extends \RuntimeException {
 
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Helper/ImageHelper.php b/lib/Tmdb/Helper/ImageHelper.php
index 20d3977d..d2051830 100644
--- a/lib/Tmdb/Helper/ImageHelper.php
+++ b/lib/Tmdb/Helper/ImageHelper.php
@@ -27,7 +27,7 @@ public function __construct(Configuration $config)
     /**
      * Load the image configuration collection
      *
-     * @return \Tmdb\Model\Common\Collection
+     * @return \Tmdb\Model\Common\GenericCollection
      */
     public function getImageConfiguration()
     {
@@ -52,6 +52,8 @@ public function getUrl(Image $image, $size = 'original') {
      *
      * @param Image $image
      * @param string $size
+     * @param int|null $width
+     * @param int|null $height
      * @return string
      */
     public function getHtml(Image $image, $size = 'original', $width = null, $height = null) {
@@ -83,4 +85,4 @@ public function getHtml(Image $image, $size = 'original', $width = null, $height
             $height
         );
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/HttpClient/HttpClient.php b/lib/Tmdb/HttpClient/HttpClient.php
index fef94e20..f8b148de 100644
--- a/lib/Tmdb/HttpClient/HttpClient.php
+++ b/lib/Tmdb/HttpClient/HttpClient.php
@@ -227,4 +227,4 @@ public function getClient()
     {
         return $this->client;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/HttpClient/HttpClientInterface.php b/lib/Tmdb/HttpClient/HttpClientInterface.php
index e00f11d6..44155184 100644
--- a/lib/Tmdb/HttpClient/HttpClientInterface.php
+++ b/lib/Tmdb/HttpClient/HttpClientInterface.php
@@ -103,4 +103,4 @@ public function setOption($name, $value);
      * @return void
      */
     public function setHeaders(array $headers);
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/HttpClient/Plugin/AcceptJsonHeaderPlugin.php b/lib/Tmdb/HttpClient/Plugin/AcceptJsonHeaderPlugin.php
index d21be6b7..6725f963 100644
--- a/lib/Tmdb/HttpClient/Plugin/AcceptJsonHeaderPlugin.php
+++ b/lib/Tmdb/HttpClient/Plugin/AcceptJsonHeaderPlugin.php
@@ -26,4 +26,4 @@ public function onBeforeSend(Event $event)
     {
         $event['request']->setHeader('accept', 'application/json');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/HttpClient/Plugin/ApiTokenPlugin.php b/lib/Tmdb/HttpClient/Plugin/ApiTokenPlugin.php
index bb271074..b2bf4b14 100644
--- a/lib/Tmdb/HttpClient/Plugin/ApiTokenPlugin.php
+++ b/lib/Tmdb/HttpClient/Plugin/ApiTokenPlugin.php
@@ -44,4 +44,4 @@ public function onBeforeSend(Event $event)
 
         $event['request']->setUrl($url->setQuery($newQuery));
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/AbstractModel.php b/lib/Tmdb/Model/AbstractModel.php
index c68b6b58..ca9e49fa 100644
--- a/lib/Tmdb/Model/AbstractModel.php
+++ b/lib/Tmdb/Model/AbstractModel.php
@@ -19,4 +19,4 @@ class AbstractModel {
      * @var array
      */
     public static $_properties = array();
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Change.php b/lib/Tmdb/Model/Change.php
index 93968c65..dd72b028 100644
--- a/lib/Tmdb/Model/Change.php
+++ b/lib/Tmdb/Model/Change.php
@@ -66,6 +66,4 @@ public function getId()
     {
         return $this->id;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Changes/Change.php b/lib/Tmdb/Model/Changes/Change.php
index 39f70779..00757147 100644
--- a/lib/Tmdb/Model/Changes/Change.php
+++ b/lib/Tmdb/Model/Changes/Change.php
@@ -75,6 +75,4 @@ public function getId()
     {
         return $this->id;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Collection.php b/lib/Tmdb/Model/Collection.php
index 45f5d40e..9276bfda 100644
--- a/lib/Tmdb/Model/Collection.php
+++ b/lib/Tmdb/Model/Collection.php
@@ -215,6 +215,4 @@ public function getPosterPath()
     {
         return $this->posterPath;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Collection/Changes.php b/lib/Tmdb/Model/Collection/Changes.php
index 20ab17aa..e57796b9 100644
--- a/lib/Tmdb/Model/Collection/Changes.php
+++ b/lib/Tmdb/Model/Collection/Changes.php
@@ -14,6 +14,4 @@
 
 use Tmdb\Model\Common\GenericCollection;
 
-class Images extends GenericCollection {
-
-} 
\ No newline at end of file
+class Images extends GenericCollection {}
diff --git a/lib/Tmdb/Model/Collection/Credits.php b/lib/Tmdb/Model/Collection/Credits.php
index ad476ee7..74ead142 100644
--- a/lib/Tmdb/Model/Collection/Credits.php
+++ b/lib/Tmdb/Model/Collection/Credits.php
@@ -70,6 +70,4 @@ public function getCrew()
     {
         return $this->crew;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Collection/Genres.php b/lib/Tmdb/Model/Collection/Genres.php
index 904649b6..216abea5 100644
--- a/lib/Tmdb/Model/Collection/Genres.php
+++ b/lib/Tmdb/Model/Collection/Genres.php
@@ -52,4 +52,4 @@ public function addGenre(Genre $genre)
     {
         $this->data[] = $genre;
     }
-} 
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Collection/Images.php b/lib/Tmdb/Model/Collection/Images.php
index bd1de85d..35e7b18c 100644
--- a/lib/Tmdb/Model/Collection/Images.php
+++ b/lib/Tmdb/Model/Collection/Images.php
@@ -192,4 +192,4 @@ public function filterBestVotedImage()
 
         return $currentImage;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Collection/Keywords.php b/lib/Tmdb/Model/Collection/Keywords.php
index 6f9ec934..eac8d594 100644
--- a/lib/Tmdb/Model/Collection/Keywords.php
+++ b/lib/Tmdb/Model/Collection/Keywords.php
@@ -52,4 +52,4 @@ public function addKeyword(Keyword $keyword)
     {
         $this->data[] = $keyword;
     }
-} 
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Collection/People.php b/lib/Tmdb/Model/Collection/People.php
index a7252e64..6f46467f 100644
--- a/lib/Tmdb/Model/Collection/People.php
+++ b/lib/Tmdb/Model/Collection/People.php
@@ -53,4 +53,4 @@ public function addPerson(PersonInterface $person)
     {
         $this->data[] = $person;
     }
-} 
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Collection/People/Cast.php b/lib/Tmdb/Model/Collection/People/Cast.php
index 9da4c463..a3d6121d 100644
--- a/lib/Tmdb/Model/Collection/People/Cast.php
+++ b/lib/Tmdb/Model/Collection/People/Cast.php
@@ -35,4 +35,4 @@ public function getCast()
     public function getCastMember($id) {
         return parent::getPerson($id);
     }
-} 
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Collection/People/Crew.php b/lib/Tmdb/Model/Collection/People/Crew.php
index a447b400..c164260a 100644
--- a/lib/Tmdb/Model/Collection/People/Crew.php
+++ b/lib/Tmdb/Model/Collection/People/Crew.php
@@ -35,4 +35,4 @@ public function getCrew()
     public function getCrewMember($id) {
         return parent::getPerson($id);
     }
-} 
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Collection/People/PersonInterface.php b/lib/Tmdb/Model/Collection/People/PersonInterface.php
index 73ad6f85..7d2aa370 100644
--- a/lib/Tmdb/Model/Collection/People/PersonInterface.php
+++ b/lib/Tmdb/Model/Collection/People/PersonInterface.php
@@ -15,4 +15,4 @@
 interface PersonInterface {
     function getName();
     function getId();
-} 
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Collection/QueryParameter/AppendToResponse.php b/lib/Tmdb/Model/Collection/QueryParameter/AppendToResponse.php
index 740bf138..8bdf290f 100644
--- a/lib/Tmdb/Model/Collection/QueryParameter/AppendToResponse.php
+++ b/lib/Tmdb/Model/Collection/QueryParameter/AppendToResponse.php
@@ -16,4 +16,4 @@
 
 final class AppendToResponse extends BaseAppendToResponse {
     const IMAGES             = 'images';
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Collection/ResultCollection.php b/lib/Tmdb/Model/Collection/ResultCollection.php
index 33b9ea50..683c24d7 100644
--- a/lib/Tmdb/Model/Collection/ResultCollection.php
+++ b/lib/Tmdb/Model/Collection/ResultCollection.php
@@ -92,4 +92,4 @@ public function getTotalResults()
     {
         return $this->totalResults;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Common/AbstractTrailer.php b/lib/Tmdb/Model/Common/AbstractTrailer.php
index d78216e7..5aea2e4d 100644
--- a/lib/Tmdb/Model/Common/AbstractTrailer.php
+++ b/lib/Tmdb/Model/Common/AbstractTrailer.php
@@ -21,4 +21,4 @@ abstract class AbstractTrailer extends AbstractModel {
      * @return string
      */
     abstract public function getUrl();
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Common/Country.php b/lib/Tmdb/Model/Common/Country.php
index fb20f4e6..7f614a10 100644
--- a/lib/Tmdb/Model/Common/Country.php
+++ b/lib/Tmdb/Model/Common/Country.php
@@ -60,6 +60,4 @@ public function getName()
     {
         return $this->name;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Common/GenericCollection.php b/lib/Tmdb/Model/Common/GenericCollection.php
index b3ea2c37..30500f59 100644
--- a/lib/Tmdb/Model/Common/GenericCollection.php
+++ b/lib/Tmdb/Model/Common/GenericCollection.php
@@ -361,4 +361,4 @@ function($key, $value) use ($adult) {
             }
         );
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Common/QueryParameter/AppendToResponse.php b/lib/Tmdb/Model/Common/QueryParameter/AppendToResponse.php
index 67744d70..b95a4e4e 100644
--- a/lib/Tmdb/Model/Common/QueryParameter/AppendToResponse.php
+++ b/lib/Tmdb/Model/Common/QueryParameter/AppendToResponse.php
@@ -22,4 +22,4 @@ public function getKey()
     {
         return 'append_to_response';
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Common/QueryParameter/QueryParameterInterface.php b/lib/Tmdb/Model/Common/QueryParameter/QueryParameterInterface.php
index 0be92642..0c85d159 100644
--- a/lib/Tmdb/Model/Common/QueryParameter/QueryParameterInterface.php
+++ b/lib/Tmdb/Model/Common/QueryParameter/QueryParameterInterface.php
@@ -22,4 +22,4 @@ function getKey();
      * @return string
      */
     function getValue();
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Common/SpokenLanguage.php b/lib/Tmdb/Model/Common/SpokenLanguage.php
index d9dfb070..e9e775f6 100644
--- a/lib/Tmdb/Model/Common/SpokenLanguage.php
+++ b/lib/Tmdb/Model/Common/SpokenLanguage.php
@@ -12,6 +12,9 @@
  */
 namespace Tmdb\Model\Common;
 
+use Tmdb\Model\AbstractModel;
+use Tmdb\Model\Filter\LanguageFilter;
+
 class SpokenLanguage extends AbstractModel implements LanguageFilter {
 
     private $iso6391;
@@ -57,6 +60,4 @@ public function getName()
     {
         return $this->name;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Common/Trailer/Youtube.php b/lib/Tmdb/Model/Common/Trailer/Youtube.php
index 1e2e7fdc..f291ff4f 100644
--- a/lib/Tmdb/Model/Common/Trailer/Youtube.php
+++ b/lib/Tmdb/Model/Common/Trailer/Youtube.php
@@ -113,6 +113,4 @@ public function getType()
     {
         return $this->type;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Common/Translation.php b/lib/Tmdb/Model/Common/Translation.php
index 6b5c531f..5339b67c 100644
--- a/lib/Tmdb/Model/Common/Translation.php
+++ b/lib/Tmdb/Model/Common/Translation.php
@@ -80,6 +80,4 @@ public function getName()
     {
         return $this->name;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Company.php b/lib/Tmdb/Model/Company.php
index 67b3c312..83bbda4b 100644
--- a/lib/Tmdb/Model/Company.php
+++ b/lib/Tmdb/Model/Company.php
@@ -178,6 +178,4 @@ public function getParentCompany()
     {
         return $this->parentCompany;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Configuration.php b/lib/Tmdb/Model/Configuration.php
index 32cda1c1..0e360c42 100644
--- a/lib/Tmdb/Model/Configuration.php
+++ b/lib/Tmdb/Model/Configuration.php
@@ -32,17 +32,17 @@ class Configuration extends AbstractModel {
     );
 
     /**
-     * @param GenericCollection $change_keys
+     * @param array $change_keys
      * @return $this
      */
-    public function setChangeKeys(GenericCollection $change_keys)
+    public function setChangeKeys(array $change_keys = array())
     {
         $this->change_keys = $change_keys;
         return $this;
     }
 
     /**
-     * @return GenericCollection
+     * @return array
      */
     public function getChangeKeys()
     {
@@ -50,20 +50,20 @@ public function getChangeKeys()
     }
 
     /**
-     * @param GenericCollection $images
+     * @param array $images
      * @return $this
      */
-    public function setImages(GenericCollection $images)
+    public function setImages(array $images = array())
     {
         $this->images = $images;
         return $this;
     }
 
     /**
-     * @return GenericCollection
+     * @return array
      */
     public function getImages()
     {
         return $this->images;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Filter/AdultFilter.php b/lib/Tmdb/Model/Filter/AdultFilter.php
index 0ac9337c..7a042f24 100644
--- a/lib/Tmdb/Model/Filter/AdultFilter.php
+++ b/lib/Tmdb/Model/Filter/AdultFilter.php
@@ -14,4 +14,4 @@
 
 interface AdultFilter {
     public function getAdult();
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Filter/CountryFilter.php b/lib/Tmdb/Model/Filter/CountryFilter.php
index d77a259a..375e8649 100644
--- a/lib/Tmdb/Model/Filter/CountryFilter.php
+++ b/lib/Tmdb/Model/Filter/CountryFilter.php
@@ -14,4 +14,4 @@
 
 interface CountryFilter {
     public function getIso31661();
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Filter/ImageFilter.php b/lib/Tmdb/Model/Filter/ImageFilter.php
index cae02dd1..a3f51b71 100644
--- a/lib/Tmdb/Model/Filter/ImageFilter.php
+++ b/lib/Tmdb/Model/Filter/ImageFilter.php
@@ -13,4 +13,4 @@
 namespace Tmdb\Model\Filter;
 
 interface ImageFilter {
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Filter/LanguageFilter.php b/lib/Tmdb/Model/Filter/LanguageFilter.php
index cc66b63c..305f2820 100644
--- a/lib/Tmdb/Model/Filter/LanguageFilter.php
+++ b/lib/Tmdb/Model/Filter/LanguageFilter.php
@@ -14,4 +14,4 @@
 
 interface LanguageFilter {
     public function getIso6391();
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Genre.php b/lib/Tmdb/Model/Genre.php
index 84aaed24..39c66a11 100644
--- a/lib/Tmdb/Model/Genre.php
+++ b/lib/Tmdb/Model/Genre.php
@@ -57,6 +57,4 @@ public function getName()
     {
         return $this->name;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Image.php b/lib/Tmdb/Model/Image.php
index b5435708..c0716cf9 100644
--- a/lib/Tmdb/Model/Image.php
+++ b/lib/Tmdb/Model/Image.php
@@ -190,6 +190,4 @@ public function getWidth()
     {
         return $this->width;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Image/BackdropImage.php b/lib/Tmdb/Model/Image/BackdropImage.php
index 4d6b10b8..f022365a 100644
--- a/lib/Tmdb/Model/Image/BackdropImage.php
+++ b/lib/Tmdb/Model/Image/BackdropImage.php
@@ -14,4 +14,4 @@
 
 use Tmdb\Model\Image;
 
-class BackdropImage extends Image {}
\ No newline at end of file
+class BackdropImage extends Image {}
diff --git a/lib/Tmdb/Model/Image/LogoImage.php b/lib/Tmdb/Model/Image/LogoImage.php
index c83d7843..4f8372c3 100644
--- a/lib/Tmdb/Model/Image/LogoImage.php
+++ b/lib/Tmdb/Model/Image/LogoImage.php
@@ -14,4 +14,4 @@
 
 use Tmdb\Model\Image;
 
-class LogoImage extends Image {}
\ No newline at end of file
+class LogoImage extends Image {}
diff --git a/lib/Tmdb/Model/Image/PosterImage.php b/lib/Tmdb/Model/Image/PosterImage.php
index 2dcd03d4..dfb9c04e 100644
--- a/lib/Tmdb/Model/Image/PosterImage.php
+++ b/lib/Tmdb/Model/Image/PosterImage.php
@@ -14,4 +14,4 @@
 
 use Tmdb\Model\Image;
 
-class PosterImage extends Image {}
\ No newline at end of file
+class PosterImage extends Image {}
diff --git a/lib/Tmdb/Model/Image/ProfileImage.php b/lib/Tmdb/Model/Image/ProfileImage.php
index ba6a7e5d..0303c686 100644
--- a/lib/Tmdb/Model/Image/ProfileImage.php
+++ b/lib/Tmdb/Model/Image/ProfileImage.php
@@ -14,4 +14,4 @@
 
 use Tmdb\Model\Image;
 
-class ProfileImage extends Image {}
\ No newline at end of file
+class ProfileImage extends Image {}
diff --git a/lib/Tmdb/Model/Image/StillImage.php b/lib/Tmdb/Model/Image/StillImage.php
index ea7587c1..994c60a8 100644
--- a/lib/Tmdb/Model/Image/StillImage.php
+++ b/lib/Tmdb/Model/Image/StillImage.php
@@ -14,4 +14,4 @@
 
 use Tmdb\Model\Image;
 
-class StillImage extends Image {}
\ No newline at end of file
+class StillImage extends Image {}
diff --git a/lib/Tmdb/Model/Movie.php b/lib/Tmdb/Model/Movie.php
index 23f494f7..f31e73be 100644
--- a/lib/Tmdb/Model/Movie.php
+++ b/lib/Tmdb/Model/Movie.php
@@ -924,4 +924,4 @@ public function getPoster()
     {
         return $this->poster;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Movie/AlternativeTitle.php b/lib/Tmdb/Model/Movie/AlternativeTitle.php
index 6541e763..6feea03f 100644
--- a/lib/Tmdb/Model/Movie/AlternativeTitle.php
+++ b/lib/Tmdb/Model/Movie/AlternativeTitle.php
@@ -60,6 +60,4 @@ public function getTitle()
     {
         return $this->title;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Movie/Keyword.php b/lib/Tmdb/Model/Movie/Keyword.php
index c2fa21b2..8f2c764e 100644
--- a/lib/Tmdb/Model/Movie/Keyword.php
+++ b/lib/Tmdb/Model/Movie/Keyword.php
@@ -59,6 +59,4 @@ public function getName()
     {
         return $this->name;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Movie/QueryParameter/AppendToResponse.php b/lib/Tmdb/Model/Movie/QueryParameter/AppendToResponse.php
index 1e763e39..3191ff36 100644
--- a/lib/Tmdb/Model/Movie/QueryParameter/AppendToResponse.php
+++ b/lib/Tmdb/Model/Movie/QueryParameter/AppendToResponse.php
@@ -26,4 +26,4 @@ final class AppendToResponse extends BaseAppendToResponse {
     const REVIEWS            = 'movies_reviews';
     const LISTS              = 'lists';
     const CHANGES            = 'changes';
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Movie/Release.php b/lib/Tmdb/Model/Movie/Release.php
index 8c723f2d..efc8625b 100644
--- a/lib/Tmdb/Model/Movie/Release.php
+++ b/lib/Tmdb/Model/Movie/Release.php
@@ -80,6 +80,4 @@ public function getReleaseDate()
     {
         return $this->releaseDate;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Person.php b/lib/Tmdb/Model/Person.php
index 9e540b18..fe380c64 100644
--- a/lib/Tmdb/Model/Person.php
+++ b/lib/Tmdb/Model/Person.php
@@ -350,4 +350,4 @@ public function getProfile()
     {
         return $this->profile;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Person/AbstractMember.php b/lib/Tmdb/Model/Person/AbstractMember.php
index e403718c..009b8478 100644
--- a/lib/Tmdb/Model/Person/AbstractMember.php
+++ b/lib/Tmdb/Model/Person/AbstractMember.php
@@ -121,6 +121,4 @@ public function getProfile()
     {
         return $this->profile;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Person/CastMember.php b/lib/Tmdb/Model/Person/CastMember.php
index 348423ff..872cd3f3 100644
--- a/lib/Tmdb/Model/Person/CastMember.php
+++ b/lib/Tmdb/Model/Person/CastMember.php
@@ -82,5 +82,4 @@ public function getCastId()
     {
         return $this->castId;
     }
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Person/CrewMember.php b/lib/Tmdb/Model/Person/CrewMember.php
index a2c12f91..8a08adf8 100644
--- a/lib/Tmdb/Model/Person/CrewMember.php
+++ b/lib/Tmdb/Model/Person/CrewMember.php
@@ -62,5 +62,4 @@ public function getJob()
     {
         return $this->job;
     }
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Person/QueryParameter/AppendToResponse.php b/lib/Tmdb/Model/Person/QueryParameter/AppendToResponse.php
index 4b80b5e7..96835e0b 100644
--- a/lib/Tmdb/Model/Person/QueryParameter/AppendToResponse.php
+++ b/lib/Tmdb/Model/Person/QueryParameter/AppendToResponse.php
@@ -20,4 +20,4 @@ final class AppendToResponse extends BaseAppendToResponse {
     const COMBINED_CREDITS  = 'combined_credits';
     const IMAGES            = 'images';
     const CHANGES           = 'changes';
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Tv.php b/lib/Tmdb/Model/Tv.php
index eee62475..f3b18905 100644
--- a/lib/Tmdb/Model/Tv.php
+++ b/lib/Tmdb/Model/Tv.php
@@ -702,6 +702,4 @@ public function getCredits()
     {
         return $this->credits;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Tv/Episode.php b/lib/Tmdb/Model/Tv/Episode.php
index b12f7f6c..b670d469 100644
--- a/lib/Tmdb/Model/Tv/Episode.php
+++ b/lib/Tmdb/Model/Tv/Episode.php
@@ -353,6 +353,4 @@ public function getImages()
     {
         return $this->images;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Tv/Episode/QueryParameter/AppendToResponse.php b/lib/Tmdb/Model/Tv/Episode/QueryParameter/AppendToResponse.php
index af847efb..6185091f 100644
--- a/lib/Tmdb/Model/Tv/Episode/QueryParameter/AppendToResponse.php
+++ b/lib/Tmdb/Model/Tv/Episode/QueryParameter/AppendToResponse.php
@@ -18,4 +18,4 @@ class AppendToResponse extends BaseAppendToResponse {
     const CREDITS      = 'credits';
     const EXTERNAL_IDS = 'external_ids';
     const IMAGES       = 'images';
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Tv/ExternalIds.php b/lib/Tmdb/Model/Tv/ExternalIds.php
index 2bf2c5b0..58f60427 100644
--- a/lib/Tmdb/Model/Tv/ExternalIds.php
+++ b/lib/Tmdb/Model/Tv/ExternalIds.php
@@ -139,6 +139,4 @@ public function getTvrageId()
     {
         return $this->tvrageId;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Tv/Network.php b/lib/Tmdb/Model/Tv/Network.php
index 4ec8c2d0..ddffced2 100644
--- a/lib/Tmdb/Model/Tv/Network.php
+++ b/lib/Tmdb/Model/Tv/Network.php
@@ -73,6 +73,4 @@ public function getName()
     {
         return $this->name;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Tv/Person/CastMember.php b/lib/Tmdb/Model/Tv/Person/CastMember.php
index 0f4500ea..0383f7f4 100644
--- a/lib/Tmdb/Model/Tv/Person/CastMember.php
+++ b/lib/Tmdb/Model/Tv/Person/CastMember.php
@@ -82,7 +82,4 @@ public function getCreditId()
     {
         return $this->creditId;
     }
-
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Tv/Person/CrewMember.php b/lib/Tmdb/Model/Tv/Person/CrewMember.php
index 47c7603a..2efabc46 100644
--- a/lib/Tmdb/Model/Tv/Person/CrewMember.php
+++ b/lib/Tmdb/Model/Tv/Person/CrewMember.php
@@ -15,4 +15,4 @@
 use Tmdb\Model\Person\CrewMember as BaseCrewMember;
 
 class CrewMember extends BaseCrewMember {
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Tv/QueryParameter/AppendToResponse.php b/lib/Tmdb/Model/Tv/QueryParameter/AppendToResponse.php
index e208141f..a7ff90d9 100644
--- a/lib/Tmdb/Model/Tv/QueryParameter/AppendToResponse.php
+++ b/lib/Tmdb/Model/Tv/QueryParameter/AppendToResponse.php
@@ -19,4 +19,4 @@ class AppendToResponse extends BaseAppendToResponse {
     const EXTERNAL_IDS  = 'external_ids';
     const IMAGES        = 'images';
     const TRANSLATIONS  = 'translations';
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Tv/Season.php b/lib/Tmdb/Model/Tv/Season.php
index 86e81f04..557d26b2 100644
--- a/lib/Tmdb/Model/Tv/Season.php
+++ b/lib/Tmdb/Model/Tv/Season.php
@@ -281,6 +281,4 @@ public function getImages()
     {
         return $this->images;
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/lib/Tmdb/Model/Tv/Season/QueryParameter/AppendToResponse.php b/lib/Tmdb/Model/Tv/Season/QueryParameter/AppendToResponse.php
index d1cc3af5..2455f63c 100644
--- a/lib/Tmdb/Model/Tv/Season/QueryParameter/AppendToResponse.php
+++ b/lib/Tmdb/Model/Tv/Season/QueryParameter/AppendToResponse.php
@@ -18,4 +18,4 @@ class AppendToResponse extends BaseAppendToResponse {
     const CREDITS      = 'credits';
     const EXTERNAL_IDS = 'external_ids';
     const IMAGES       = 'images';
-}
\ No newline at end of file
+}