diff --git a/lib/Tmdb/Api/AbstractApi.php b/lib/Tmdb/Api/AbstractApi.php
index 9dcfd9ff..3e4f2437 100644
--- a/lib/Tmdb/Api/AbstractApi.php
+++ b/lib/Tmdb/Api/AbstractApi.php
@@ -15,6 +15,10 @@
 use Guzzle\Http\Message\Response;
 use Tmdb\Client;
 
+/**
+ * Class AbstractApi
+ * @package Tmdb\Api
+ */
 abstract class AbstractApi
     implements ApiInterface
 {
diff --git a/lib/Tmdb/Api/ApiInterface.php b/lib/Tmdb/Api/ApiInterface.php
index 45687b38..5719777c 100644
--- a/lib/Tmdb/Api/ApiInterface.php
+++ b/lib/Tmdb/Api/ApiInterface.php
@@ -12,5 +12,9 @@
  */
 namespace Tmdb\Api;
 
+/**
+ * Interface ApiInterface
+ * @package Tmdb\Api
+ */
 interface ApiInterface {
 }
diff --git a/lib/Tmdb/ApiToken.php b/lib/Tmdb/ApiToken.php
index 8ab89bc2..0f6bffa3 100644
--- a/lib/Tmdb/ApiToken.php
+++ b/lib/Tmdb/ApiToken.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb;
 
+/**
+ * Class ApiToken
+ * @package Tmdb
+ */
 class ApiToken {
     private $apiToken = null;
 
diff --git a/lib/Tmdb/Client.php b/lib/Tmdb/Client.php
index 7d425c09..743ad5e6 100644
--- a/lib/Tmdb/Client.php
+++ b/lib/Tmdb/Client.php
@@ -22,8 +22,7 @@
 use Tmdb\HttpClient\Plugin\SessionTokenPlugin;
 
 /**
- * Simple wrapper for the Tmdb API
- *
+ * Client wrapper for TMDB
  * @package Tmdb
  */
 class Client {
diff --git a/lib/Tmdb/Exception/InvalidArgumentException.php b/lib/Tmdb/Exception/InvalidArgumentException.php
index c72fcc93..023ce8b7 100644
--- a/lib/Tmdb/Exception/InvalidArgumentException.php
+++ b/lib/Tmdb/Exception/InvalidArgumentException.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Exception;
 
+/**
+ * Class InvalidArgumentException
+ * @package Tmdb\Exception
+ */
 class InvalidArgumentException extends \InvalidArgumentException {
 
 }
diff --git a/lib/Tmdb/Exception/MissingArgumentException.php b/lib/Tmdb/Exception/MissingArgumentException.php
index 6151ade7..edbedd87 100644
--- a/lib/Tmdb/Exception/MissingArgumentException.php
+++ b/lib/Tmdb/Exception/MissingArgumentException.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Exception;
 
+/**
+ * Class MissingArgumentException
+ * @package Tmdb\Exception
+ */
 class MissingArgumentException extends \InvalidArgumentException {
 
 }
diff --git a/lib/Tmdb/Exception/NotImplementedException.php b/lib/Tmdb/Exception/NotImplementedException.php
index 14ac20ee..65659f48 100644
--- a/lib/Tmdb/Exception/NotImplementedException.php
+++ b/lib/Tmdb/Exception/NotImplementedException.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Exception;
 
+/**
+ * Class NotImplementedException
+ * @package Tmdb\Exception
+ */
 class NotImplementedException extends \Exception {
 
 }
diff --git a/lib/Tmdb/Exception/RuntimeException.php b/lib/Tmdb/Exception/RuntimeException.php
index 1a231bc4..a3f6c3e6 100644
--- a/lib/Tmdb/Exception/RuntimeException.php
+++ b/lib/Tmdb/Exception/RuntimeException.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Exception;
 
+/**
+ * Class RuntimeException
+ * @package Tmdb\Exception
+ */
 class RuntimeException extends \RuntimeException {
 
 }
diff --git a/lib/Tmdb/Exception/UnauthorizedRequestTokenException.php b/lib/Tmdb/Exception/UnauthorizedRequestTokenException.php
index 056557f4..d96a8b58 100644
--- a/lib/Tmdb/Exception/UnauthorizedRequestTokenException.php
+++ b/lib/Tmdb/Exception/UnauthorizedRequestTokenException.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Exception;
 
+/**
+ * Class UnauthorizedRequestTokenException
+ * @package Tmdb\Exception
+ */
 class UnauthorizedRequestTokenException extends \RuntimeException {
 
 }
diff --git a/lib/Tmdb/Factory/AbstractFactory.php b/lib/Tmdb/Factory/AbstractFactory.php
index b57d8a57..34cc63f7 100644
--- a/lib/Tmdb/Factory/AbstractFactory.php
+++ b/lib/Tmdb/Factory/AbstractFactory.php
@@ -17,6 +17,10 @@
 use Tmdb\Model\Collection\ResultCollection;
 use Tmdb\Model\Common\GenericCollection;
 
+/**
+ * Class AbstractFactory
+ * @package Tmdb\Factory
+ */
 abstract class AbstractFactory implements FactoryInterface {
     /**
      * Convert an array to an hydrated object
diff --git a/lib/Tmdb/Factory/AccountFactory.php b/lib/Tmdb/Factory/AccountFactory.php
index ef481754..85c066ca 100644
--- a/lib/Tmdb/Factory/AccountFactory.php
+++ b/lib/Tmdb/Factory/AccountFactory.php
@@ -16,6 +16,10 @@
 use Tmdb\Model\Account;
 use Tmdb\Model\Lists\Result;
 
+/**
+ * Class AccountFactory
+ * @package Tmdb\Factory
+ */
 class AccountFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/AuthenticationFactory.php b/lib/Tmdb/Factory/AuthenticationFactory.php
index 3cf77797..38b61d9e 100644
--- a/lib/Tmdb/Factory/AuthenticationFactory.php
+++ b/lib/Tmdb/Factory/AuthenticationFactory.php
@@ -16,6 +16,10 @@
 use Tmdb\RequestToken;
 use Tmdb\SessionToken;
 
+/**
+ * Class AuthenticationFactory
+ * @package Tmdb\Factory
+ */
 class AuthenticationFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/CertificationFactory.php b/lib/Tmdb/Factory/CertificationFactory.php
index 430173d9..6b92f418 100644
--- a/lib/Tmdb/Factory/CertificationFactory.php
+++ b/lib/Tmdb/Factory/CertificationFactory.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\Certification;
 use Tmdb\Model\Common\GenericCollection;
 
+/**
+ * Class CertificationFactory
+ * @package Tmdb\Factory
+ */
 class CertificationFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/ChangesFactory.php b/lib/Tmdb/Factory/ChangesFactory.php
index 9147ebc9..ba21489a 100644
--- a/lib/Tmdb/Factory/ChangesFactory.php
+++ b/lib/Tmdb/Factory/ChangesFactory.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\Change;
 use Tmdb\Model\Collection\Changes;
 
+/**
+ * Class ChangesFactory
+ * @package Tmdb\Factory
+ */
 class ChangesFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/CollectionFactory.php b/lib/Tmdb/Factory/CollectionFactory.php
index 935c5b0e..f1c29e2d 100644
--- a/lib/Tmdb/Factory/CollectionFactory.php
+++ b/lib/Tmdb/Factory/CollectionFactory.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\Collection;
 use Tmdb\Model\Common\GenericCollection;
 
+/**
+ * Class CollectionFactory
+ * @package Tmdb\Factory
+ */
 class CollectionFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/Common/ChangeFactory.php b/lib/Tmdb/Factory/Common/ChangeFactory.php
index 52488a41..896ae1a7 100644
--- a/lib/Tmdb/Factory/Common/ChangeFactory.php
+++ b/lib/Tmdb/Factory/Common/ChangeFactory.php
@@ -16,6 +16,10 @@
 use Tmdb\Model\Common\Change;
 use Tmdb\Model\Common\GenericCollection;
 
+/**
+ * Class ChangeFactory
+ * @package Tmdb\Factory\Common
+ */
 class ChangeFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/CompanyFactory.php b/lib/Tmdb/Factory/CompanyFactory.php
index e47a5468..7fac2dda 100644
--- a/lib/Tmdb/Factory/CompanyFactory.php
+++ b/lib/Tmdb/Factory/CompanyFactory.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Company;
 
+/**
+ * Class CompanyFactory
+ * @package Tmdb\Factory
+ */
 class CompanyFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/ConfigurationFactory.php b/lib/Tmdb/Factory/ConfigurationFactory.php
index 68ce7750..0f18d267 100644
--- a/lib/Tmdb/Factory/ConfigurationFactory.php
+++ b/lib/Tmdb/Factory/ConfigurationFactory.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Configuration;
 
+/**
+ * Class ConfigurationFactory
+ * @package Tmdb\Factory
+ */
 class ConfigurationFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/CreditsFactory.php b/lib/Tmdb/Factory/CreditsFactory.php
index 4f91e4d9..5b33634d 100644
--- a/lib/Tmdb/Factory/CreditsFactory.php
+++ b/lib/Tmdb/Factory/CreditsFactory.php
@@ -17,6 +17,10 @@
 use Tmdb\Model\Movie;
 use Tmdb\Model\Credits as Credits;
 
+/**
+ * Class CreditsFactory
+ * @package Tmdb\Factory
+ */
 class CreditsFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/FactoryInterface.php b/lib/Tmdb/Factory/FactoryInterface.php
index c5b4e462..1afcaaba 100644
--- a/lib/Tmdb/Factory/FactoryInterface.php
+++ b/lib/Tmdb/Factory/FactoryInterface.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Factory;
 
+/**
+ * Interface FactoryInterface
+ * @package Tmdb\Factory
+ */
 interface FactoryInterface {
 
     /**
diff --git a/lib/Tmdb/Factory/FindFactory.php b/lib/Tmdb/Factory/FindFactory.php
index df30ffe1..cba3716d 100644
--- a/lib/Tmdb/Factory/FindFactory.php
+++ b/lib/Tmdb/Factory/FindFactory.php
@@ -15,6 +15,10 @@
 use Tmdb\Exception\NotImplementedException;
 use Tmdb\Model\Find;
 
+/**
+ * Class FindFactory
+ * @package Tmdb\Factory
+ */
 class FindFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/GenreFactory.php b/lib/Tmdb/Factory/GenreFactory.php
index 1c31cf2d..f87116d3 100644
--- a/lib/Tmdb/Factory/GenreFactory.php
+++ b/lib/Tmdb/Factory/GenreFactory.php
@@ -16,6 +16,10 @@
 use Tmdb\Model\Genre;
 use Tmdb\Model\Movie;
 
+/**
+ * Class GenreFactory
+ * @package Tmdb\Factory
+ */
 class GenreFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/ImageFactory.php b/lib/Tmdb/Factory/ImageFactory.php
index 6acdff82..f1d0a2e3 100644
--- a/lib/Tmdb/Factory/ImageFactory.php
+++ b/lib/Tmdb/Factory/ImageFactory.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\Collection\Images;
 use Tmdb\Model\Image;
 
+/**
+ * Class ImageFactory
+ * @package Tmdb\Factory
+ */
 class ImageFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/JobsFactory.php b/lib/Tmdb/Factory/JobsFactory.php
index 6e8cbb41..07725155 100644
--- a/lib/Tmdb/Factory/JobsFactory.php
+++ b/lib/Tmdb/Factory/JobsFactory.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\Collection\Jobs;
 use Tmdb\Model\Job;
 
+/**
+ * Class JobsFactory
+ * @package Tmdb\Factory
+ */
 class JobsFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/KeywordFactory.php b/lib/Tmdb/Factory/KeywordFactory.php
index 2a6598e4..2fe2c650 100644
--- a/lib/Tmdb/Factory/KeywordFactory.php
+++ b/lib/Tmdb/Factory/KeywordFactory.php
@@ -16,6 +16,10 @@
 use Tmdb\Model\Keyword;
 use Tmdb\Model\Movie;
 
+/**
+ * Class KeywordFactory
+ * @package Tmdb\Factory
+ */
 class KeywordFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/ListFactory.php b/lib/Tmdb/Factory/ListFactory.php
index 0f98e3ec..11e33b2d 100644
--- a/lib/Tmdb/Factory/ListFactory.php
+++ b/lib/Tmdb/Factory/ListFactory.php
@@ -13,12 +13,15 @@
 namespace Tmdb\Factory;
 
 use Tmdb\Factory\Lists\ListItemFactory;
-use Tmdb\Model\Collection\Genres;
 use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Genre;
 use Tmdb\Model\Lists;
 use Tmdb\Model\Movie;
 
+/**
+ * Class ListFactory
+ * @package Tmdb\Factory
+ */
 class ListFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/Lists/ListItemFactory.php b/lib/Tmdb/Factory/Lists/ListItemFactory.php
index 75e4f9d1..208cc9db 100644
--- a/lib/Tmdb/Factory/Lists/ListItemFactory.php
+++ b/lib/Tmdb/Factory/Lists/ListItemFactory.php
@@ -17,6 +17,10 @@
 use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Lists\ListItem;
 
+/**
+ * Class ListItemFactory
+ * @package Tmdb\Factory\Lists
+ */
 class ListItemFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/Movie/AlternativeTitleFactory.php b/lib/Tmdb/Factory/Movie/AlternativeTitleFactory.php
index 6bdb5be3..7195f5b0 100644
--- a/lib/Tmdb/Factory/Movie/AlternativeTitleFactory.php
+++ b/lib/Tmdb/Factory/Movie/AlternativeTitleFactory.php
@@ -16,6 +16,10 @@
 use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Movie\AlternativeTitle;
 
+/**
+ * Class AlternativeTitleFactory
+ * @package Tmdb\Factory\Movie
+ */
 class AlternativeTitleFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/Movie/ListItemFactory.php b/lib/Tmdb/Factory/Movie/ListItemFactory.php
index cd06d646..3ca64eae 100644
--- a/lib/Tmdb/Factory/Movie/ListItemFactory.php
+++ b/lib/Tmdb/Factory/Movie/ListItemFactory.php
@@ -14,9 +14,12 @@
 
 use Tmdb\Factory\AbstractFactory;
 use Tmdb\Factory\ImageFactory;
-use Tmdb\Model\Collection\ResultCollection;
 use Tmdb\Model\Movie\ListItem;
 
+/**
+ * Class ListItemFactory
+ * @package Tmdb\Factory\Movie
+ */
 class ListItemFactory extends AbstractFactory
 {
     private $imageFactory;
diff --git a/lib/Tmdb/Factory/MovieFactory.php b/lib/Tmdb/Factory/MovieFactory.php
index 505c6e97..b14f31a0 100644
--- a/lib/Tmdb/Factory/MovieFactory.php
+++ b/lib/Tmdb/Factory/MovieFactory.php
@@ -14,7 +14,6 @@
 
 use Tmdb\Factory\Common\ChangeFactory;
 use Tmdb\Factory\Movie\ListItemFactory;
-use Tmdb\Factory\ReviewFactory;
 use Tmdb\Factory\People\CastFactory;
 use Tmdb\Factory\People\CrewFactory;
 use Tmdb\Model\Common\GenericCollection;
@@ -23,6 +22,10 @@
 use Tmdb\Model\Lists\Result;
 use Tmdb\Model\Movie;
 
+/**
+ * Class MovieFactory
+ * @package Tmdb\Factory
+ */
 class MovieFactory extends AbstractFactory {
     /**
      * @var People\CastFactory
diff --git a/lib/Tmdb/Factory/NetworkFactory.php b/lib/Tmdb/Factory/NetworkFactory.php
index 037ae6b7..fd2cc67f 100644
--- a/lib/Tmdb/Factory/NetworkFactory.php
+++ b/lib/Tmdb/Factory/NetworkFactory.php
@@ -12,11 +12,14 @@
  */
 namespace Tmdb\Factory;
 
-use Tmdb\Model\Collection\Networks;
 use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Network;
 use Tmdb\Model\Movie;
 
+/**
+ * Class NetworkFactory
+ * @package Tmdb\Factory
+ */
 class NetworkFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/People/CastFactory.php b/lib/Tmdb/Factory/People/CastFactory.php
index 97d17275..09300754 100644
--- a/lib/Tmdb/Factory/People/CastFactory.php
+++ b/lib/Tmdb/Factory/People/CastFactory.php
@@ -15,6 +15,10 @@
 use Tmdb\Factory\PeopleFactory;
 use Tmdb\Model\Collection\People\Cast;
 
+/**
+ * Class CastFactory
+ * @package Tmdb\Factory\People
+ */
 class CastFactory extends PeopleFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/People/CrewFactory.php b/lib/Tmdb/Factory/People/CrewFactory.php
index 68fc6d1a..ae9bf8ec 100644
--- a/lib/Tmdb/Factory/People/CrewFactory.php
+++ b/lib/Tmdb/Factory/People/CrewFactory.php
@@ -15,6 +15,10 @@
 use Tmdb\Factory\PeopleFactory;
 use Tmdb\Model\Collection\People\Crew;
 
+/**
+ * Class CrewFactory
+ * @package Tmdb\Factory\People
+ */
 class CrewFactory extends PeopleFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/PeopleFactory.php b/lib/Tmdb/Factory/PeopleFactory.php
index 4b0bedf0..a46b8901 100644
--- a/lib/Tmdb/Factory/PeopleFactory.php
+++ b/lib/Tmdb/Factory/PeopleFactory.php
@@ -14,14 +14,16 @@
 
 use Tmdb\Common\ObjectHydrator;
 use Tmdb\Factory\Common\ChangeFactory;
-use Tmdb\Model\Collection\People\Cast;
-use Tmdb\Model\Collection\People\Crew;
 use Tmdb\Model\Collection\People;
 use Tmdb\Model\Common\ExternalIds;
 use Tmdb\Model\Person\CastMember;
 use Tmdb\Model\Person\CrewMember;
 use Tmdb\Model\Person;
 
+/**
+ * Class PeopleFactory
+ * @package Tmdb\Factory
+ */
 class PeopleFactory extends AbstractFactory {
     /**
      * @var ImageFactory
diff --git a/lib/Tmdb/Factory/ReviewFactory.php b/lib/Tmdb/Factory/ReviewFactory.php
index 5792f230..4ff4ca05 100644
--- a/lib/Tmdb/Factory/ReviewFactory.php
+++ b/lib/Tmdb/Factory/ReviewFactory.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Review;
 
+/**
+ * Class ReviewFactory
+ * @package Tmdb\Factory
+ */
 class ReviewFactory extends AbstractFactory
 {
     /**
diff --git a/lib/Tmdb/Factory/TvEpisodeFactory.php b/lib/Tmdb/Factory/TvEpisodeFactory.php
index b665bea0..bc40a9a1 100644
--- a/lib/Tmdb/Factory/TvEpisodeFactory.php
+++ b/lib/Tmdb/Factory/TvEpisodeFactory.php
@@ -20,6 +20,10 @@
 use Tmdb\Model\Common\ExternalIds;
 use Tmdb\Model\Tv\Episode;
 
+/**
+ * Class TvEpisodeFactory
+ * @package Tmdb\Factory
+ */
 class TvEpisodeFactory extends AbstractFactory {
     /**
      * @var People\CastFactory
diff --git a/lib/Tmdb/Factory/TvFactory.php b/lib/Tmdb/Factory/TvFactory.php
index 9f5af617..0b1d1091 100644
--- a/lib/Tmdb/Factory/TvFactory.php
+++ b/lib/Tmdb/Factory/TvFactory.php
@@ -21,6 +21,10 @@
 use Tmdb\Model\Common\ExternalIds;
 use Tmdb\Model\Tv;
 
+/**
+ * Class TvFactory
+ * @package Tmdb\Factory
+ */
 class TvFactory extends AbstractFactory {
     /**
      * @var People\CastFactory
diff --git a/lib/Tmdb/Factory/TvSeasonFactory.php b/lib/Tmdb/Factory/TvSeasonFactory.php
index e18313ed..78fc88d1 100644
--- a/lib/Tmdb/Factory/TvSeasonFactory.php
+++ b/lib/Tmdb/Factory/TvSeasonFactory.php
@@ -20,6 +20,10 @@
 use Tmdb\Model\Common\ExternalIds;
 use Tmdb\Model\Tv\Season;
 
+/**
+ * Class TvSeasonFactory
+ * @package Tmdb\Factory
+ */
 class TvSeasonFactory extends AbstractFactory {
     /**
      * @var People\CastFactory
diff --git a/lib/Tmdb/Helper/ImageHelper.php b/lib/Tmdb/Helper/ImageHelper.php
index 0a93cfd2..c5f94fce 100644
--- a/lib/Tmdb/Helper/ImageHelper.php
+++ b/lib/Tmdb/Helper/ImageHelper.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\Configuration;
 use Tmdb\Model\Image;
 
+/**
+ * Class ImageHelper
+ * @package Tmdb\Helper
+ */
 class ImageHelper {
 
     private $config;
diff --git a/lib/Tmdb/HttpClient/HttpClient.php b/lib/Tmdb/HttpClient/HttpClient.php
index 66009723..76554c25 100644
--- a/lib/Tmdb/HttpClient/HttpClient.php
+++ b/lib/Tmdb/HttpClient/HttpClient.php
@@ -18,6 +18,10 @@
 use Guzzle\Http\Message\Response;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
+/**
+ * Class HttpClient
+ * @package Tmdb\HttpClient
+ */
 class HttpClient
     implements HttpClientInterface
 {
diff --git a/lib/Tmdb/HttpClient/HttpClientInterface.php b/lib/Tmdb/HttpClient/HttpClientInterface.php
index 7b8b6e9b..1899df98 100644
--- a/lib/Tmdb/HttpClient/HttpClientInterface.php
+++ b/lib/Tmdb/HttpClient/HttpClientInterface.php
@@ -12,10 +12,13 @@
  */
 namespace Tmdb\HttpClient;
 
-use Guzzle\Common\Exception\InvalidArgumentException;
 use Guzzle\Http\Message\RequestInterface;
 use Guzzle\Http\Message\Response;
 
+/**
+ * Interface HttpClientInterface
+ * @package Tmdb\HttpClient
+ */
 interface HttpClientInterface
 {
     /**
diff --git a/lib/Tmdb/HttpClient/Plugin/AcceptJsonHeaderPlugin.php b/lib/Tmdb/HttpClient/Plugin/AcceptJsonHeaderPlugin.php
index 6725f963..05fc6a11 100644
--- a/lib/Tmdb/HttpClient/Plugin/AcceptJsonHeaderPlugin.php
+++ b/lib/Tmdb/HttpClient/Plugin/AcceptJsonHeaderPlugin.php
@@ -15,6 +15,10 @@
 use Guzzle\Common\Event;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
+/**
+ * Class AcceptJsonHeaderPlugin
+ * @package Tmdb\HttpClient\Plugin
+ */
 class AcceptJsonHeaderPlugin implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
diff --git a/lib/Tmdb/HttpClient/Plugin/AdultFilterPlugin.php b/lib/Tmdb/HttpClient/Plugin/AdultFilterPlugin.php
index 166d022f..18698271 100644
--- a/lib/Tmdb/HttpClient/Plugin/AdultFilterPlugin.php
+++ b/lib/Tmdb/HttpClient/Plugin/AdultFilterPlugin.php
@@ -15,6 +15,10 @@
 use Guzzle\Common\Event;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
+/**
+ * Class AdultFilterPlugin
+ * @package Tmdb\HttpClient\Plugin
+ */
 class AdultFilterPlugin implements EventSubscriberInterface
 {
     private $includeAdult;
diff --git a/lib/Tmdb/HttpClient/Plugin/ApiTokenPlugin.php b/lib/Tmdb/HttpClient/Plugin/ApiTokenPlugin.php
index 7a3a5bff..c7eaa6a6 100644
--- a/lib/Tmdb/HttpClient/Plugin/ApiTokenPlugin.php
+++ b/lib/Tmdb/HttpClient/Plugin/ApiTokenPlugin.php
@@ -16,6 +16,10 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Tmdb\ApiToken;
 
+/**
+ * Class ApiTokenPlugin
+ * @package Tmdb\HttpClient\Plugin
+ */
 class ApiTokenPlugin implements EventSubscriberInterface
 {
     /**
diff --git a/lib/Tmdb/HttpClient/Plugin/LanguageFilterPlugin.php b/lib/Tmdb/HttpClient/Plugin/LanguageFilterPlugin.php
index fd29835c..122f059d 100644
--- a/lib/Tmdb/HttpClient/Plugin/LanguageFilterPlugin.php
+++ b/lib/Tmdb/HttpClient/Plugin/LanguageFilterPlugin.php
@@ -15,6 +15,10 @@
 use Guzzle\Common\Event;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
+/**
+ * Class LanguageFilterPlugin
+ * @package Tmdb\HttpClient\Plugin
+ */
 class LanguageFilterPlugin implements EventSubscriberInterface
 {
     private $language;
diff --git a/lib/Tmdb/HttpClient/Plugin/SessionTokenPlugin.php b/lib/Tmdb/HttpClient/Plugin/SessionTokenPlugin.php
index 0d95fe3a..d7536df0 100644
--- a/lib/Tmdb/HttpClient/Plugin/SessionTokenPlugin.php
+++ b/lib/Tmdb/HttpClient/Plugin/SessionTokenPlugin.php
@@ -16,6 +16,10 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Tmdb\SessionToken;
 
+/**
+ * Class SessionTokenPlugin
+ * @package Tmdb\HttpClient\Plugin
+ */
 class SessionTokenPlugin implements EventSubscriberInterface
 {
     /**
diff --git a/lib/Tmdb/Model/AbstractModel.php b/lib/Tmdb/Model/AbstractModel.php
index e5414f08..4d40864f 100644
--- a/lib/Tmdb/Model/AbstractModel.php
+++ b/lib/Tmdb/Model/AbstractModel.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model;
 
+/**
+ * Class AbstractModel
+ * @package Tmdb\Model
+ */
 class AbstractModel {
     /**
      * List of properties to populate by the ObjectHydrator
diff --git a/lib/Tmdb/Model/Account.php b/lib/Tmdb/Model/Account.php
index e7a9e17a..a9334b51 100644
--- a/lib/Tmdb/Model/Account.php
+++ b/lib/Tmdb/Model/Account.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model;
 
+/**
+ * Class Account
+ * @package Tmdb\Model
+ */
 class Account extends AbstractModel {
     /**
      * @var integer
diff --git a/lib/Tmdb/Model/Account/ListItem.php b/lib/Tmdb/Model/Account/ListItem.php
index 3d3b8aa5..7ce61239 100644
--- a/lib/Tmdb/Model/Account/ListItem.php
+++ b/lib/Tmdb/Model/Account/ListItem.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\AbstractModel;
 use Tmdb\Model\Image\PosterImage;
 
+/**
+ * Class ListItem
+ * @package Tmdb\Model\Account
+ */
 class ListItem extends AbstractModel {
     /**
      * @var string
diff --git a/lib/Tmdb/Model/Certification.php b/lib/Tmdb/Model/Certification.php
index 338ae356..dea8b7f6 100644
--- a/lib/Tmdb/Model/Certification.php
+++ b/lib/Tmdb/Model/Certification.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Common\GenericCollection;
 
+/**
+ * Class Certification
+ * @package Tmdb\Model
+ */
 class Certification extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Certification/CountryCertification.php b/lib/Tmdb/Model/Certification/CountryCertification.php
index 089f7d93..479a93d1 100644
--- a/lib/Tmdb/Model/Certification/CountryCertification.php
+++ b/lib/Tmdb/Model/Certification/CountryCertification.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\AbstractModel;
 
+/**
+ * Class CountryCertification
+ * @package Tmdb\Model\Certification
+ */
 class CountryCertification extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Change.php b/lib/Tmdb/Model/Change.php
index f0d36445..c3186cce 100644
--- a/lib/Tmdb/Model/Change.php
+++ b/lib/Tmdb/Model/Change.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model;
 
+/**
+ * Class Change
+ * @package Tmdb\Model
+ */
 class Change extends AbstractModel {
     /**
      * @var integer
diff --git a/lib/Tmdb/Model/Collection.php b/lib/Tmdb/Model/Collection.php
index f8c6ecad..e11948a9 100644
--- a/lib/Tmdb/Model/Collection.php
+++ b/lib/Tmdb/Model/Collection.php
@@ -17,6 +17,10 @@
 use Tmdb\Model\Image\BackdropImage;
 use Tmdb\Model\Image\PosterImage;
 
+/**
+ * Class Collection
+ * @package Tmdb\Model
+ */
 class Collection extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Collection/Changes.php b/lib/Tmdb/Model/Collection/Changes.php
index ff37e8dd..1d047b89 100644
--- a/lib/Tmdb/Model/Collection/Changes.php
+++ b/lib/Tmdb/Model/Collection/Changes.php
@@ -12,4 +12,8 @@
  */
 namespace Tmdb\Model\Collection;
 
+/**
+ * Class Changes
+ * @package Tmdb\Model\Collection
+ */
 class Changes extends ResultCollection {}
diff --git a/lib/Tmdb/Model/Collection/CreditsCollection.php b/lib/Tmdb/Model/Collection/CreditsCollection.php
index 55ff55d2..d81f57ab 100644
--- a/lib/Tmdb/Model/Collection/CreditsCollection.php
+++ b/lib/Tmdb/Model/Collection/CreditsCollection.php
@@ -16,6 +16,10 @@
 use Tmdb\Model\Collection\People\Crew;
 use Tmdb\Model\Common\GenericCollection;
 
+/**
+ * Class CreditsCollection
+ * @package Tmdb\Model\Collection
+ */
 class CreditsCollection {
     /**
      * @var Cast
diff --git a/lib/Tmdb/Model/Collection/CreditsCollection/CombinedCredits.php b/lib/Tmdb/Model/Collection/CreditsCollection/CombinedCredits.php
index 413eafe8..a321af2d 100644
--- a/lib/Tmdb/Model/Collection/CreditsCollection/CombinedCredits.php
+++ b/lib/Tmdb/Model/Collection/CreditsCollection/CombinedCredits.php
@@ -14,4 +14,8 @@
 
 use Tmdb\Model\Collection\CreditsCollection;
 
+/**
+ * Class CombinedCredits
+ * @package Tmdb\Model\Collection\CreditsCollection
+ */
 class CombinedCredits extends CreditsCollection {}
diff --git a/lib/Tmdb/Model/Collection/CreditsCollection/MovieCredits.php b/lib/Tmdb/Model/Collection/CreditsCollection/MovieCredits.php
index 6f79f005..6d63d4cd 100644
--- a/lib/Tmdb/Model/Collection/CreditsCollection/MovieCredits.php
+++ b/lib/Tmdb/Model/Collection/CreditsCollection/MovieCredits.php
@@ -14,4 +14,8 @@
 
 use Tmdb\Model\Collection\CreditsCollection;
 
+/**
+ * Class MovieCredits
+ * @package Tmdb\Model\Collection\CreditsCollection
+ */
 class MovieCredits extends CreditsCollection {}
diff --git a/lib/Tmdb/Model/Collection/CreditsCollection/TvCredits.php b/lib/Tmdb/Model/Collection/CreditsCollection/TvCredits.php
index f24ae5e4..b2d91be7 100644
--- a/lib/Tmdb/Model/Collection/CreditsCollection/TvCredits.php
+++ b/lib/Tmdb/Model/Collection/CreditsCollection/TvCredits.php
@@ -14,4 +14,8 @@
 
 use Tmdb\Model\Collection\CreditsCollection;
 
+/**
+ * Class TvCredits
+ * @package Tmdb\Model\Collection\CreditsCollection
+ */
 class TvCredits extends CreditsCollection {}
diff --git a/lib/Tmdb/Model/Collection/Genres.php b/lib/Tmdb/Model/Collection/Genres.php
index 216abea5..169fc1a6 100644
--- a/lib/Tmdb/Model/Collection/Genres.php
+++ b/lib/Tmdb/Model/Collection/Genres.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Genre;
 
+/**
+ * Class Genres
+ * @package Tmdb\Model\Collection
+ */
 class Genres extends GenericCollection {
 
     /**
diff --git a/lib/Tmdb/Model/Collection/Images.php b/lib/Tmdb/Model/Collection/Images.php
index 7601441b..38525357 100644
--- a/lib/Tmdb/Model/Collection/Images.php
+++ b/lib/Tmdb/Model/Collection/Images.php
@@ -16,6 +16,10 @@
 use Tmdb\Model\Filter\ImageFilter;
 use Tmdb\Model\Image;
 
+/**
+ * Class Images
+ * @package Tmdb\Model\Collection
+ */
 class Images extends GenericCollection {
 
     /**
diff --git a/lib/Tmdb/Model/Collection/Jobs.php b/lib/Tmdb/Model/Collection/Jobs.php
index 8e25a59c..74079930 100644
--- a/lib/Tmdb/Model/Collection/Jobs.php
+++ b/lib/Tmdb/Model/Collection/Jobs.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Common\GenericCollection;
 
+/**
+ * Class Jobs
+ * @package Tmdb\Model\Collection
+ */
 class Jobs extends GenericCollection {
 
     /**
diff --git a/lib/Tmdb/Model/Collection/Keywords.php b/lib/Tmdb/Model/Collection/Keywords.php
index 9f9f9146..d6d52a90 100644
--- a/lib/Tmdb/Model/Collection/Keywords.php
+++ b/lib/Tmdb/Model/Collection/Keywords.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Keyword;
 
+/**
+ * Class Keywords
+ * @package Tmdb\Model\Collection
+ */
 class Keywords extends GenericCollection {
 
     /**
diff --git a/lib/Tmdb/Model/Collection/People.php b/lib/Tmdb/Model/Collection/People.php
index baacf8fa..65a16784 100644
--- a/lib/Tmdb/Model/Collection/People.php
+++ b/lib/Tmdb/Model/Collection/People.php
@@ -16,6 +16,10 @@
 use Tmdb\Model\Collection\People\PersonInterface;
 use Tmdb\Model\Person;
 
+/**
+ * Class People
+ * @package Tmdb\Model\Collection
+ */
 class People extends GenericCollection {
 
     /**
diff --git a/lib/Tmdb/Model/Collection/People/Cast.php b/lib/Tmdb/Model/Collection/People/Cast.php
index a3d6121d..ff4b8dbc 100644
--- a/lib/Tmdb/Model/Collection/People/Cast.php
+++ b/lib/Tmdb/Model/Collection/People/Cast.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\Collection\People;
 use Tmdb\Model\Person;
 
+/**
+ * Class Cast
+ * @package Tmdb\Model\Collection\People
+ */
 class Cast extends People {
     /**
      * Returns all people
diff --git a/lib/Tmdb/Model/Collection/People/Crew.php b/lib/Tmdb/Model/Collection/People/Crew.php
index c164260a..d3a06649 100644
--- a/lib/Tmdb/Model/Collection/People/Crew.php
+++ b/lib/Tmdb/Model/Collection/People/Crew.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\Collection\People;
 use Tmdb\Model\Person;
 
+/**
+ * Class Crew
+ * @package Tmdb\Model\Collection\People
+ */
 class Crew extends People {
     /**
      * Returns all people
diff --git a/lib/Tmdb/Model/Collection/People/PersonInterface.php b/lib/Tmdb/Model/Collection/People/PersonInterface.php
index ee5fcd39..4f4538c1 100644
--- a/lib/Tmdb/Model/Collection/People/PersonInterface.php
+++ b/lib/Tmdb/Model/Collection/People/PersonInterface.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model\Collection\People;
 
+/**
+ * Interface PersonInterface
+ * @package Tmdb\Model\Collection\People
+ */
 interface PersonInterface {
     function getName();
 
diff --git a/lib/Tmdb/Model/Collection/QueryParameter/AppendToResponse.php b/lib/Tmdb/Model/Collection/QueryParameter/AppendToResponse.php
index 8bdf290f..5523f6c2 100644
--- a/lib/Tmdb/Model/Collection/QueryParameter/AppendToResponse.php
+++ b/lib/Tmdb/Model/Collection/QueryParameter/AppendToResponse.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Common\QueryParameter\AppendToResponse as BaseAppendToResponse;
 
+/**
+ * Class AppendToResponse
+ * @package Tmdb\Model\Collection\QueryParameter
+ */
 final class AppendToResponse extends BaseAppendToResponse {
     const IMAGES             = 'images';
 }
diff --git a/lib/Tmdb/Model/Collection/QueryParametersCollection.php b/lib/Tmdb/Model/Collection/QueryParametersCollection.php
index d7afeabe..b1f3cd21 100644
--- a/lib/Tmdb/Model/Collection/QueryParametersCollection.php
+++ b/lib/Tmdb/Model/Collection/QueryParametersCollection.php
@@ -14,4 +14,8 @@
 
 use Tmdb\Model\Common\GenericCollection;
 
+/**
+ * Class QueryParametersCollection
+ * @package Tmdb\Model\Collection
+ */
 class QueryParametersCollection extends GenericCollection {}
diff --git a/lib/Tmdb/Model/Collection/ResultCollection.php b/lib/Tmdb/Model/Collection/ResultCollection.php
index 1b7bb00f..aa0acbcc 100644
--- a/lib/Tmdb/Model/Collection/ResultCollection.php
+++ b/lib/Tmdb/Model/Collection/ResultCollection.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Common\GenericCollection;
 
+/**
+ * Class ResultCollection
+ * @package Tmdb\Model\Collection
+ */
 class ResultCollection extends GenericCollection {
     /**
      * @var int
diff --git a/lib/Tmdb/Model/Common/AbstractTrailer.php b/lib/Tmdb/Model/Common/AbstractTrailer.php
index 5aea2e4d..083a3c9e 100644
--- a/lib/Tmdb/Model/Common/AbstractTrailer.php
+++ b/lib/Tmdb/Model/Common/AbstractTrailer.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\AbstractModel;
 
+/**
+ * Class AbstractTrailer
+ * @package Tmdb\Model\Common
+ */
 abstract class AbstractTrailer extends AbstractModel {
     /**
      * Returns the http url to the trailer
diff --git a/lib/Tmdb/Model/Common/Change.php b/lib/Tmdb/Model/Common/Change.php
index b339b208..2d4663f3 100644
--- a/lib/Tmdb/Model/Common/Change.php
+++ b/lib/Tmdb/Model/Common/Change.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\AbstractModel;
 
+/**
+ * Class Change
+ * @package Tmdb\Model\Common
+ */
 class Change extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Common/Change/Item.php b/lib/Tmdb/Model/Common/Change/Item.php
index 1df89e11..766483a4 100644
--- a/lib/Tmdb/Model/Common/Change/Item.php
+++ b/lib/Tmdb/Model/Common/Change/Item.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\AbstractModel;
 
+/**
+ * Class Item
+ * @package Tmdb\Model\Common\Change
+ */
 class Item extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Common/Country.php b/lib/Tmdb/Model/Common/Country.php
index 4fad6459..9e0dfcd4 100644
--- a/lib/Tmdb/Model/Common/Country.php
+++ b/lib/Tmdb/Model/Common/Country.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\AbstractModel;
 use Tmdb\Model\Filter\CountryFilter;
 
+/**
+ * Class Country
+ * @package Tmdb\Model\Common
+ */
 class Country extends AbstractModel implements CountryFilter {
 
     private $iso31661;
diff --git a/lib/Tmdb/Model/Common/ExternalIds.php b/lib/Tmdb/Model/Common/ExternalIds.php
index fe593089..a36a4b13 100644
--- a/lib/Tmdb/Model/Common/ExternalIds.php
+++ b/lib/Tmdb/Model/Common/ExternalIds.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\AbstractModel;
 
+/**
+ * Class ExternalIds
+ * @package Tmdb\Model\Common
+ */
 class ExternalIds extends AbstractModel {
 
     private $imdbId;
diff --git a/lib/Tmdb/Model/Common/GenericCollection.php b/lib/Tmdb/Model/Common/GenericCollection.php
index 6001743e..bd9ef70c 100644
--- a/lib/Tmdb/Model/Common/GenericCollection.php
+++ b/lib/Tmdb/Model/Common/GenericCollection.php
@@ -19,6 +19,10 @@
 use Tmdb\Model\Filter\CountryFilter;
 use Tmdb\Model\Filter\LanguageFilter;
 
+/**
+ * Class GenericCollection
+ * @package Tmdb\Model\Common
+ */
 class GenericCollection implements \ArrayAccess, \IteratorAggregate, \Countable {
     /** @var array Data associated with the object. */
     protected $data = array();
diff --git a/lib/Tmdb/Model/Common/QueryParameter/Adult.php b/lib/Tmdb/Model/Common/QueryParameter/Adult.php
index b19a9574..5aed8bb2 100644
--- a/lib/Tmdb/Model/Common/QueryParameter/Adult.php
+++ b/lib/Tmdb/Model/Common/QueryParameter/Adult.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model\Common\QueryParameter;
 
+/**
+ * Class Adult
+ * @package Tmdb\Model\Common\QueryParameter
+ */
 class Adult implements QueryParameterInterface {
 
     private $adult;
diff --git a/lib/Tmdb/Model/Common/QueryParameter/AppendToResponse.php b/lib/Tmdb/Model/Common/QueryParameter/AppendToResponse.php
index b95a4e4e..a9c409d7 100644
--- a/lib/Tmdb/Model/Common/QueryParameter/AppendToResponse.php
+++ b/lib/Tmdb/Model/Common/QueryParameter/AppendToResponse.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Common\QueryParameter\Type\CollectionToCommaSeperatedString;
 
+/**
+ * Class AppendToResponse
+ * @package Tmdb\Model\Common\QueryParameter
+ */
 class AppendToResponse extends CollectionToCommaSeperatedString {
     /**
      * @return string
diff --git a/lib/Tmdb/Model/Common/QueryParameter/Language.php b/lib/Tmdb/Model/Common/QueryParameter/Language.php
index f5ea2d8b..4a91a10e 100644
--- a/lib/Tmdb/Model/Common/QueryParameter/Language.php
+++ b/lib/Tmdb/Model/Common/QueryParameter/Language.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model\Common\QueryParameter;
 
+/**
+ * Class Language
+ * @package Tmdb\Model\Common\QueryParameter
+ */
 class Language implements QueryParameterInterface {
 
     private $language;
diff --git a/lib/Tmdb/Model/Common/QueryParameter/QueryParameterInterface.php b/lib/Tmdb/Model/Common/QueryParameter/QueryParameterInterface.php
index 0c85d159..87ab2154 100644
--- a/lib/Tmdb/Model/Common/QueryParameter/QueryParameterInterface.php
+++ b/lib/Tmdb/Model/Common/QueryParameter/QueryParameterInterface.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model\Common\QueryParameter;
 
+/**
+ * Interface QueryParameterInterface
+ * @package Tmdb\Model\Common\QueryParameter
+ */
 interface QueryParameterInterface {
     /**
      * @return string
diff --git a/lib/Tmdb/Model/Common/QueryParameter/Type/CollectionToCommaSeperatedString.php b/lib/Tmdb/Model/Common/QueryParameter/Type/CollectionToCommaSeperatedString.php
index ec86e5da..3ecb1413 100644
--- a/lib/Tmdb/Model/Common/QueryParameter/Type/CollectionToCommaSeperatedString.php
+++ b/lib/Tmdb/Model/Common/QueryParameter/Type/CollectionToCommaSeperatedString.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Common\QueryParameter\QueryParameterInterface;
 
+/**
+ * Class CollectionToCommaSeperatedString
+ * @package Tmdb\Model\Common\QueryParameter\Type
+ */
 abstract class CollectionToCommaSeperatedString extends GenericCollection implements QueryParameterInterface {
     /**
      * @param array $collection
diff --git a/lib/Tmdb/Model/Common/SpokenLanguage.php b/lib/Tmdb/Model/Common/SpokenLanguage.php
index 547c2754..0c441d85 100644
--- a/lib/Tmdb/Model/Common/SpokenLanguage.php
+++ b/lib/Tmdb/Model/Common/SpokenLanguage.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\AbstractModel;
 use Tmdb\Model\Filter\LanguageFilter;
 
+/**
+ * Class SpokenLanguage
+ * @package Tmdb\Model\Common
+ */
 class SpokenLanguage extends AbstractModel implements LanguageFilter {
 
     private $iso6391;
diff --git a/lib/Tmdb/Model/Common/Trailer/Youtube.php b/lib/Tmdb/Model/Common/Trailer/Youtube.php
index 78ffc1ad..bc00660b 100644
--- a/lib/Tmdb/Model/Common/Trailer/Youtube.php
+++ b/lib/Tmdb/Model/Common/Trailer/Youtube.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Common\AbstractTrailer;
 
+/**
+ * Class Youtube
+ * @package Tmdb\Model\Common\Trailer
+ */
 class Youtube extends AbstractTrailer {
 
     const URL = 'http://www.youtube.com/watch?v=%s';
diff --git a/lib/Tmdb/Model/Common/Translation.php b/lib/Tmdb/Model/Common/Translation.php
index 84a608e6..6d0f9a64 100644
--- a/lib/Tmdb/Model/Common/Translation.php
+++ b/lib/Tmdb/Model/Common/Translation.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Filter\LanguageFilter;
 
+/**
+ * Class Translation
+ * @package Tmdb\Model\Common
+ */
 class Translation extends SpokenLanguage implements LanguageFilter {
 
     private $englishName;
diff --git a/lib/Tmdb/Model/Company.php b/lib/Tmdb/Model/Company.php
index 8457b98c..79b8a351 100644
--- a/lib/Tmdb/Model/Company.php
+++ b/lib/Tmdb/Model/Company.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Image\LogoImage;
 
+/**
+ * Class Company
+ * @package Tmdb\Model
+ */
 class Company extends AbstractModel {
 
     private $description;
diff --git a/lib/Tmdb/Model/Configuration.php b/lib/Tmdb/Model/Configuration.php
index 421a7a0a..699dfeb7 100644
--- a/lib/Tmdb/Model/Configuration.php
+++ b/lib/Tmdb/Model/Configuration.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model;
 
+/**
+ * Class Configuration
+ * @package Tmdb\Model
+ */
 class Configuration extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Credits.php b/lib/Tmdb/Model/Credits.php
index dd05dca3..72688a31 100644
--- a/lib/Tmdb/Model/Credits.php
+++ b/lib/Tmdb/Model/Credits.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Credits\Media;
 
+/**
+ * Class Credits
+ * @package Tmdb\Model
+ */
 class Credits extends AbstractModel {
     /**
      * @var string
diff --git a/lib/Tmdb/Model/Credits/Media.php b/lib/Tmdb/Model/Credits/Media.php
index a3977591..24b0e4b7 100644
--- a/lib/Tmdb/Model/Credits/Media.php
+++ b/lib/Tmdb/Model/Credits/Media.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\AbstractModel;
 use Tmdb\Model\Common\GenericCollection;
 
+/**
+ * Class Media
+ * @package Tmdb\Model\Credits
+ */
 class Media extends AbstractModel {
     /**
      * @var integer
diff --git a/lib/Tmdb/Model/Filter/AdultFilter.php b/lib/Tmdb/Model/Filter/AdultFilter.php
index 7a042f24..71a612a8 100644
--- a/lib/Tmdb/Model/Filter/AdultFilter.php
+++ b/lib/Tmdb/Model/Filter/AdultFilter.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model\Filter;
 
+/**
+ * Interface AdultFilter
+ * @package Tmdb\Model\Filter
+ */
 interface AdultFilter {
     public function getAdult();
 }
diff --git a/lib/Tmdb/Model/Filter/CountryFilter.php b/lib/Tmdb/Model/Filter/CountryFilter.php
index 1edee1b2..4d6645f4 100644
--- a/lib/Tmdb/Model/Filter/CountryFilter.php
+++ b/lib/Tmdb/Model/Filter/CountryFilter.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model\Filter;
 
+/**
+ * Interface CountryFilter
+ * @package Tmdb\Model\Filter
+ */
 interface CountryFilter {
 
     /**
diff --git a/lib/Tmdb/Model/Filter/ImageFilter.php b/lib/Tmdb/Model/Filter/ImageFilter.php
index a3f51b71..593a8581 100644
--- a/lib/Tmdb/Model/Filter/ImageFilter.php
+++ b/lib/Tmdb/Model/Filter/ImageFilter.php
@@ -12,5 +12,9 @@
  */
 namespace Tmdb\Model\Filter;
 
+/**
+ * Interface ImageFilter
+ * @package Tmdb\Model\Filter
+ */
 interface ImageFilter {
 }
diff --git a/lib/Tmdb/Model/Filter/LanguageFilter.php b/lib/Tmdb/Model/Filter/LanguageFilter.php
index 305f2820..cc1d8d31 100644
--- a/lib/Tmdb/Model/Filter/LanguageFilter.php
+++ b/lib/Tmdb/Model/Filter/LanguageFilter.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model\Filter;
 
+/**
+ * Interface LanguageFilter
+ * @package Tmdb\Model\Filter
+ */
 interface LanguageFilter {
     public function getIso6391();
 }
diff --git a/lib/Tmdb/Model/Find.php b/lib/Tmdb/Model/Find.php
index c0bb201e..4812265b 100644
--- a/lib/Tmdb/Model/Find.php
+++ b/lib/Tmdb/Model/Find.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\Collection\People;
 use Tmdb\Model\Common\GenericCollection;
 
+/**
+ * Class Find
+ * @package Tmdb\Model
+ */
 class Find extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Genre.php b/lib/Tmdb/Model/Genre.php
index 39c66a11..44569c02 100644
--- a/lib/Tmdb/Model/Genre.php
+++ b/lib/Tmdb/Model/Genre.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model;
 
+/**
+ * Class Genre
+ * @package Tmdb\Model
+ */
 class Genre extends AbstractModel {
 
     private $id;
diff --git a/lib/Tmdb/Model/Image.php b/lib/Tmdb/Model/Image.php
index 59131f39..28a77e4f 100644
--- a/lib/Tmdb/Model/Image.php
+++ b/lib/Tmdb/Model/Image.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\Filter\ImageFilter;
 use Tmdb\Model\Filter\LanguageFilter;
 
+/**
+ * Class Image
+ * @package Tmdb\Model
+ */
 class Image extends AbstractModel implements ImageFilter, LanguageFilter {
 
     const FORMAT_POSTER   = 'poster';
diff --git a/lib/Tmdb/Model/Image/BackdropImage.php b/lib/Tmdb/Model/Image/BackdropImage.php
index f022365a..81f9c6bb 100644
--- a/lib/Tmdb/Model/Image/BackdropImage.php
+++ b/lib/Tmdb/Model/Image/BackdropImage.php
@@ -14,4 +14,8 @@
 
 use Tmdb\Model\Image;
 
+/**
+ * Class BackdropImage
+ * @package Tmdb\Model\Image
+ */
 class BackdropImage extends Image {}
diff --git a/lib/Tmdb/Model/Image/LogoImage.php b/lib/Tmdb/Model/Image/LogoImage.php
index 4f8372c3..e2e82035 100644
--- a/lib/Tmdb/Model/Image/LogoImage.php
+++ b/lib/Tmdb/Model/Image/LogoImage.php
@@ -14,4 +14,8 @@
 
 use Tmdb\Model\Image;
 
+/**
+ * Class LogoImage
+ * @package Tmdb\Model\Image
+ */
 class LogoImage extends Image {}
diff --git a/lib/Tmdb/Model/Image/PosterImage.php b/lib/Tmdb/Model/Image/PosterImage.php
index dfb9c04e..e0337de6 100644
--- a/lib/Tmdb/Model/Image/PosterImage.php
+++ b/lib/Tmdb/Model/Image/PosterImage.php
@@ -14,4 +14,8 @@
 
 use Tmdb\Model\Image;
 
+/**
+ * Class PosterImage
+ * @package Tmdb\Model\Image
+ */
 class PosterImage extends Image {}
diff --git a/lib/Tmdb/Model/Image/ProfileImage.php b/lib/Tmdb/Model/Image/ProfileImage.php
index 0303c686..a62bbdcc 100644
--- a/lib/Tmdb/Model/Image/ProfileImage.php
+++ b/lib/Tmdb/Model/Image/ProfileImage.php
@@ -14,4 +14,8 @@
 
 use Tmdb\Model\Image;
 
+/**
+ * Class ProfileImage
+ * @package Tmdb\Model\Image
+ */
 class ProfileImage extends Image {}
diff --git a/lib/Tmdb/Model/Image/StillImage.php b/lib/Tmdb/Model/Image/StillImage.php
index 994c60a8..dff71b50 100644
--- a/lib/Tmdb/Model/Image/StillImage.php
+++ b/lib/Tmdb/Model/Image/StillImage.php
@@ -14,4 +14,8 @@
 
 use Tmdb\Model\Image;
 
+/**
+ * Class StillImage
+ * @package Tmdb\Model\Image
+ */
 class StillImage extends Image {}
diff --git a/lib/Tmdb/Model/Job.php b/lib/Tmdb/Model/Job.php
index 47a9ebcb..c7876538 100644
--- a/lib/Tmdb/Model/Job.php
+++ b/lib/Tmdb/Model/Job.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model;
 
+/**
+ * Class Job
+ * @package Tmdb\Model
+ */
 class Job extends AbstractModel {
 
     public static $_properties = array(
diff --git a/lib/Tmdb/Model/Keyword.php b/lib/Tmdb/Model/Keyword.php
index 347bbe92..7c2755f8 100644
--- a/lib/Tmdb/Model/Keyword.php
+++ b/lib/Tmdb/Model/Keyword.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model;
 
+/**
+ * Class Keyword
+ * @package Tmdb\Model
+ */
 class Keyword extends AbstractModel {
 
     private $id;
diff --git a/lib/Tmdb/Model/Lists.php b/lib/Tmdb/Model/Lists.php
index 70dcafb8..722c31f3 100644
--- a/lib/Tmdb/Model/Lists.php
+++ b/lib/Tmdb/Model/Lists.php
@@ -13,9 +13,12 @@
 namespace Tmdb\Model;
 
 use Tmdb\Model\Common\GenericCollection;
-use Tmdb\Model\Image\BackdropImage;
 use Tmdb\Model\Image\PosterImage;
 
+/**
+ * Class Lists
+ * @package Tmdb\Model
+ */
 class Lists extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Lists/ItemStatus.php b/lib/Tmdb/Model/Lists/ItemStatus.php
index fc737bae..44187e05 100644
--- a/lib/Tmdb/Model/Lists/ItemStatus.php
+++ b/lib/Tmdb/Model/Lists/ItemStatus.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\AbstractModel;
 
+/**
+ * Class ItemStatus
+ * @package Tmdb\Model\Lists
+ */
 class ItemStatus extends AbstractModel {
     /**
      * @var string
diff --git a/lib/Tmdb/Model/Lists/ListItem.php b/lib/Tmdb/Model/Lists/ListItem.php
index e0834001..fdc0a142 100644
--- a/lib/Tmdb/Model/Lists/ListItem.php
+++ b/lib/Tmdb/Model/Lists/ListItem.php
@@ -16,6 +16,10 @@
 use Tmdb\Model\Image\BackdropImage;
 use Tmdb\Model\Image\PosterImage;
 
+/**
+ * Class ListItem
+ * @package Tmdb\Model\Lists
+ */
 class ListItem extends AbstractModel {
     /**
      * @var string
diff --git a/lib/Tmdb/Model/Lists/Result.php b/lib/Tmdb/Model/Lists/Result.php
index 261c2377..814ed7d5 100644
--- a/lib/Tmdb/Model/Lists/Result.php
+++ b/lib/Tmdb/Model/Lists/Result.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\AbstractModel;
 
+/**
+ * Class Result
+ * @package Tmdb\Model\Lists
+ */
 class Result extends AbstractModel {
     /**
      * @var int
diff --git a/lib/Tmdb/Model/Lists/ResultWithListId.php b/lib/Tmdb/Model/Lists/ResultWithListId.php
index a526babf..8048496c 100644
--- a/lib/Tmdb/Model/Lists/ResultWithListId.php
+++ b/lib/Tmdb/Model/Lists/ResultWithListId.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model\Lists;
 
+/**
+ * Class ResultWithListId
+ * @package Tmdb\Model\Lists
+ */
 class ResultWithListId extends Result {
     /**
      * @var string
diff --git a/lib/Tmdb/Model/Movie.php b/lib/Tmdb/Model/Movie.php
index 867702e6..0ca5b9b7 100644
--- a/lib/Tmdb/Model/Movie.php
+++ b/lib/Tmdb/Model/Movie.php
@@ -22,9 +22,12 @@
 use Tmdb\Model\Common\SpokenLanguage;
 use Tmdb\Model\Common\Translation;
 use Tmdb\Model\Movie\AlternativeTitle;
-use Tmdb\Model\Movie\Keyword;
 use Tmdb\Model\Movie\Release;
 
+/**
+ * Class Movie
+ * @package Tmdb\Model
+ */
 class Movie extends AbstractModel {
     /**
      * @var bool
diff --git a/lib/Tmdb/Model/Movie/AccountStates.php b/lib/Tmdb/Model/Movie/AccountStates.php
index bae93379..062011b2 100644
--- a/lib/Tmdb/Model/Movie/AccountStates.php
+++ b/lib/Tmdb/Model/Movie/AccountStates.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\AbstractModel;
 
+/**
+ * Class AccountStates
+ * @package Tmdb\Model\Movie
+ */
 class AccountStates extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Movie/AlternativeTitle.php b/lib/Tmdb/Model/Movie/AlternativeTitle.php
index 7a97a68d..d8b388df 100644
--- a/lib/Tmdb/Model/Movie/AlternativeTitle.php
+++ b/lib/Tmdb/Model/Movie/AlternativeTitle.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\AbstractModel;
 use Tmdb\Model\Filter\CountryFilter;
 
+/**
+ * Class AlternativeTitle
+ * @package Tmdb\Model\Movie
+ */
 class AlternativeTitle extends AbstractModel implements CountryFilter {
 
     private $iso31661;
diff --git a/lib/Tmdb/Model/Movie/ListItem.php b/lib/Tmdb/Model/Movie/ListItem.php
index 46bdf62a..1eda953b 100644
--- a/lib/Tmdb/Model/Movie/ListItem.php
+++ b/lib/Tmdb/Model/Movie/ListItem.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\AbstractModel;
 use Tmdb\Model\Image\PosterImage;
 
+/**
+ * Class ListItem
+ * @package Tmdb\Model\Movie
+ */
 class ListItem extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Movie/QueryParameter/AppendToResponse.php b/lib/Tmdb/Model/Movie/QueryParameter/AppendToResponse.php
index b29c68b8..532af7cc 100644
--- a/lib/Tmdb/Model/Movie/QueryParameter/AppendToResponse.php
+++ b/lib/Tmdb/Model/Movie/QueryParameter/AppendToResponse.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Common\QueryParameter\AppendToResponse as BaseAppendToResponse;
 
+/**
+ * Class AppendToResponse
+ * @package Tmdb\Model\Movie\QueryParameter
+ */
 final class AppendToResponse extends BaseAppendToResponse {
     const ALTERNATIVE_TITLES = 'alternative_titles';
     const CREDITS            = 'credits';
diff --git a/lib/Tmdb/Model/Movie/Rating.php b/lib/Tmdb/Model/Movie/Rating.php
index 41a09e02..a9d11b9e 100644
--- a/lib/Tmdb/Model/Movie/Rating.php
+++ b/lib/Tmdb/Model/Movie/Rating.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\AbstractModel;
 
+/**
+ * Class Rating
+ * @package Tmdb\Model\Movie
+ */
 class Rating extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Movie/Release.php b/lib/Tmdb/Model/Movie/Release.php
index 480615a7..2b739301 100644
--- a/lib/Tmdb/Model/Movie/Release.php
+++ b/lib/Tmdb/Model/Movie/Release.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\AbstractModel;
 use Tmdb\Model\Filter\CountryFilter;
 
+/**
+ * Class Release
+ * @package Tmdb\Model\Movie
+ */
 class Release extends AbstractModel implements CountryFilter {
 
     private $iso31661;
diff --git a/lib/Tmdb/Model/Network.php b/lib/Tmdb/Model/Network.php
index d99f5a36..db2f1d1e 100644
--- a/lib/Tmdb/Model/Network.php
+++ b/lib/Tmdb/Model/Network.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model;
 
+/**
+ * Class Network
+ * @package Tmdb\Model
+ */
 class Network extends AbstractModel {
 
     private $id;
diff --git a/lib/Tmdb/Model/Person.php b/lib/Tmdb/Model/Person.php
index 93050924..ced88646 100644
--- a/lib/Tmdb/Model/Person.php
+++ b/lib/Tmdb/Model/Person.php
@@ -19,6 +19,10 @@
 use Tmdb\Model\Collection\People\PersonInterface;
 use Tmdb\Model\Image\ProfileImage;
 
+/**
+ * Class Person
+ * @package Tmdb\Model
+ */
 class Person extends AbstractModel implements PersonInterface {
 
     /**
diff --git a/lib/Tmdb/Model/Person/AbstractMember.php b/lib/Tmdb/Model/Person/AbstractMember.php
index 1f17d81d..283c2af5 100644
--- a/lib/Tmdb/Model/Person/AbstractMember.php
+++ b/lib/Tmdb/Model/Person/AbstractMember.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\AbstractModel;
 use Tmdb\Model\Image;
 
+/**
+ * Class AbstractMember
+ * @package Tmdb\Model\Person
+ */
 abstract class AbstractMember extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Person/CastMember.php b/lib/Tmdb/Model/Person/CastMember.php
index eb2bf7ed..bbf47e10 100644
--- a/lib/Tmdb/Model/Person/CastMember.php
+++ b/lib/Tmdb/Model/Person/CastMember.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Collection\People\PersonInterface;
 
+/**
+ * Class CastMember
+ * @package Tmdb\Model\Person
+ */
 class CastMember extends AbstractMember implements PersonInterface {
 
     /**
diff --git a/lib/Tmdb/Model/Person/CrewMember.php b/lib/Tmdb/Model/Person/CrewMember.php
index b97f7629..83b395a4 100644
--- a/lib/Tmdb/Model/Person/CrewMember.php
+++ b/lib/Tmdb/Model/Person/CrewMember.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Collection\People\PersonInterface;
 
+/**
+ * Class CrewMember
+ * @package Tmdb\Model\Person
+ */
 class CrewMember extends AbstractMember implements PersonInterface {
 
     /**
diff --git a/lib/Tmdb/Model/Person/MovieCredit.php b/lib/Tmdb/Model/Person/MovieCredit.php
index 6740df95..afb232ea 100644
--- a/lib/Tmdb/Model/Person/MovieCredit.php
+++ b/lib/Tmdb/Model/Person/MovieCredit.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\AbstractModel;
 use Tmdb\Model\Image\PosterImage;
 
+/**
+ * Class MovieCredit
+ * @package Tmdb\Model\Person
+ */
 class MovieCredit extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Person/QueryParameter/AppendToResponse.php b/lib/Tmdb/Model/Person/QueryParameter/AppendToResponse.php
index 815a9aab..8d851d26 100644
--- a/lib/Tmdb/Model/Person/QueryParameter/AppendToResponse.php
+++ b/lib/Tmdb/Model/Person/QueryParameter/AppendToResponse.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Common\QueryParameter\AppendToResponse as BaseAppendToResponse;
 
+/**
+ * Class AppendToResponse
+ * @package Tmdb\Model\Person\QueryParameter
+ */
 final class AppendToResponse extends BaseAppendToResponse {
     const MOVIE_CREDITS     = 'movie_credits';
     const TV_CREDITS        = 'tv_credits';
diff --git a/lib/Tmdb/Model/Query/ChangesQuery.php b/lib/Tmdb/Model/Query/ChangesQuery.php
index e9d39538..513593e9 100644
--- a/lib/Tmdb/Model/Query/ChangesQuery.php
+++ b/lib/Tmdb/Model/Query/ChangesQuery.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Collection\QueryParametersCollection;
 
+/**
+ * Class ChangesQuery
+ * @package Tmdb\Model\Query
+ */
 class ChangesQuery extends QueryParametersCollection {
 
     /**
diff --git a/lib/Tmdb/Model/Query/Discover/DiscoverMoviesQuery.php b/lib/Tmdb/Model/Query/Discover/DiscoverMoviesQuery.php
index 50a5f058..8ac74856 100644
--- a/lib/Tmdb/Model/Query/Discover/DiscoverMoviesQuery.php
+++ b/lib/Tmdb/Model/Query/Discover/DiscoverMoviesQuery.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Collection\QueryParametersCollection;
 
+/**
+ * Class DiscoverMoviesQuery
+ * @package Tmdb\Model\Query\Discover
+ */
 class DiscoverMoviesQuery extends QueryParametersCollection {
     /**
      * Minimum value is 1, expected value is an integer.
diff --git a/lib/Tmdb/Model/Query/Discover/DiscoverTvQuery.php b/lib/Tmdb/Model/Query/Discover/DiscoverTvQuery.php
index 6ebd5550..6066e637 100644
--- a/lib/Tmdb/Model/Query/Discover/DiscoverTvQuery.php
+++ b/lib/Tmdb/Model/Query/Discover/DiscoverTvQuery.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Collection\QueryParametersCollection;
 
+/**
+ * Class DiscoverTvQuery
+ * @package Tmdb\Model\Query\Discover
+ */
 class DiscoverTvQuery extends QueryParametersCollection {
     /**
      * Minimum value is 1, expected value is an integer.
diff --git a/lib/Tmdb/Model/Query/FindQuery.php b/lib/Tmdb/Model/Query/FindQuery.php
index 302761dc..eadfdc2b 100644
--- a/lib/Tmdb/Model/Query/FindQuery.php
+++ b/lib/Tmdb/Model/Query/FindQuery.php
@@ -15,6 +15,10 @@
 use Tmdb\Model\Collection\QueryParametersCollection;
 
 // @todo
+/**
+ * Class FindQuery
+ * @package Tmdb\Model\Query
+ */
 class FindQuery extends QueryParametersCollection {
 
 }
diff --git a/lib/Tmdb/Model/Review.php b/lib/Tmdb/Model/Review.php
index 8c790fff..f56e2f89 100644
--- a/lib/Tmdb/Model/Review.php
+++ b/lib/Tmdb/Model/Review.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb\Model;
 
+/**
+ * Class Review
+ * @package Tmdb\Model
+ */
 class Review extends AbstractModel {
 
     private $id;
diff --git a/lib/Tmdb/Model/Search/SearchQuery.php b/lib/Tmdb/Model/Search/SearchQuery.php
index 55ff8dc4..e32b95f8 100644
--- a/lib/Tmdb/Model/Search/SearchQuery.php
+++ b/lib/Tmdb/Model/Search/SearchQuery.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Collection\QueryParametersCollection;
 
+/**
+ * Class SearchQuery
+ * @package Tmdb\Model\Search
+ */
 class SearchQuery extends QueryParametersCollection {
     /**
      * CGI escaped string
diff --git a/lib/Tmdb/Model/Search/SearchQuery/CollectionSearchQuery.php b/lib/Tmdb/Model/Search/SearchQuery/CollectionSearchQuery.php
index 37871cfe..db513d7f 100644
--- a/lib/Tmdb/Model/Search/SearchQuery/CollectionSearchQuery.php
+++ b/lib/Tmdb/Model/Search/SearchQuery/CollectionSearchQuery.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Search\SearchQuery;
 
+/**
+ * Class CollectionSearchQuery
+ * @package Tmdb\Model\Search\SearchQuery
+ */
 class CollectionSearchQuery extends SearchQuery {
     /**
      * ISO 639-1 code.
diff --git a/lib/Tmdb/Model/Search/SearchQuery/CompanySearchQuery.php b/lib/Tmdb/Model/Search/SearchQuery/CompanySearchQuery.php
index b1545ce4..03741501 100644
--- a/lib/Tmdb/Model/Search/SearchQuery/CompanySearchQuery.php
+++ b/lib/Tmdb/Model/Search/SearchQuery/CompanySearchQuery.php
@@ -14,4 +14,8 @@
 
 use Tmdb\Model\Search\SearchQuery;
 
+/**
+ * Class CompanySearchQuery
+ * @package Tmdb\Model\Search\SearchQuery
+ */
 class CompanySearchQuery extends SearchQuery {}
diff --git a/lib/Tmdb/Model/Search/SearchQuery/KeywordSearchQuery.php b/lib/Tmdb/Model/Search/SearchQuery/KeywordSearchQuery.php
index b32a4fbd..972287a7 100644
--- a/lib/Tmdb/Model/Search/SearchQuery/KeywordSearchQuery.php
+++ b/lib/Tmdb/Model/Search/SearchQuery/KeywordSearchQuery.php
@@ -14,4 +14,8 @@
 
 use Tmdb\Model\Search\SearchQuery;
 
+/**
+ * Class KeywordSearchQuery
+ * @package Tmdb\Model\Search\SearchQuery
+ */
 class KeywordSearchQuery extends SearchQuery {}
diff --git a/lib/Tmdb/Model/Search/SearchQuery/ListSearchQuery.php b/lib/Tmdb/Model/Search/SearchQuery/ListSearchQuery.php
index 34a796aa..05206313 100644
--- a/lib/Tmdb/Model/Search/SearchQuery/ListSearchQuery.php
+++ b/lib/Tmdb/Model/Search/SearchQuery/ListSearchQuery.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Search\SearchQuery;
 
+/**
+ * Class ListSearchQuery
+ * @package Tmdb\Model\Search\SearchQuery
+ */
 class ListSearchQuery extends SearchQuery {
 
     /**
diff --git a/lib/Tmdb/Model/Search/SearchQuery/MovieSearchQuery.php b/lib/Tmdb/Model/Search/SearchQuery/MovieSearchQuery.php
index b464005a..58fc7e0b 100644
--- a/lib/Tmdb/Model/Search/SearchQuery/MovieSearchQuery.php
+++ b/lib/Tmdb/Model/Search/SearchQuery/MovieSearchQuery.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Search\SearchQuery;
 
+/**
+ * Class MovieSearchQuery
+ * @package Tmdb\Model\Search\SearchQuery
+ */
 class MovieSearchQuery extends SearchQuery {
     /**
      * ISO 639-1 code.
diff --git a/lib/Tmdb/Model/Search/SearchQuery/PersonSearchQuery.php b/lib/Tmdb/Model/Search/SearchQuery/PersonSearchQuery.php
index 2abd9de4..ab86ffa6 100644
--- a/lib/Tmdb/Model/Search/SearchQuery/PersonSearchQuery.php
+++ b/lib/Tmdb/Model/Search/SearchQuery/PersonSearchQuery.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Search\SearchQuery;
 
+/**
+ * Class PersonSearchQuery
+ * @package Tmdb\Model\Search\SearchQuery
+ */
 class PersonSearchQuery extends SearchQuery {
 
     /**
diff --git a/lib/Tmdb/Model/Search/SearchQuery/TvSearchQuery.php b/lib/Tmdb/Model/Search/SearchQuery/TvSearchQuery.php
index d7763864..d8863425 100644
--- a/lib/Tmdb/Model/Search/SearchQuery/TvSearchQuery.php
+++ b/lib/Tmdb/Model/Search/SearchQuery/TvSearchQuery.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Search\SearchQuery;
 
+/**
+ * Class TvSearchQuery
+ * @package Tmdb\Model\Search\SearchQuery
+ */
 class TvSearchQuery extends SearchQuery {
     /**
      * ISO 639-1 code.
diff --git a/lib/Tmdb/Model/Tv.php b/lib/Tmdb/Model/Tv.php
index 20818f00..ac18ad9f 100644
--- a/lib/Tmdb/Model/Tv.php
+++ b/lib/Tmdb/Model/Tv.php
@@ -21,6 +21,10 @@
 use Tmdb\Model\Common\ExternalIds;
 use Tmdb\Model\Tv\Network;
 
+/**
+ * Class Tv
+ * @package Tmdb\Model
+ */
 class Tv extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Tv/Episode.php b/lib/Tmdb/Model/Tv/Episode.php
index 64130d43..1a4b5e64 100644
--- a/lib/Tmdb/Model/Tv/Episode.php
+++ b/lib/Tmdb/Model/Tv/Episode.php
@@ -18,6 +18,10 @@
 use Tmdb\Model\Common\ExternalIds;
 use Tmdb\Model\Image\StillImage;
 
+/**
+ * Class Episode
+ * @package Tmdb\Model\Tv
+ */
 class Episode extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Tv/Episode/QueryParameter/AppendToResponse.php b/lib/Tmdb/Model/Tv/Episode/QueryParameter/AppendToResponse.php
index 6185091f..80815631 100644
--- a/lib/Tmdb/Model/Tv/Episode/QueryParameter/AppendToResponse.php
+++ b/lib/Tmdb/Model/Tv/Episode/QueryParameter/AppendToResponse.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Common\QueryParameter\AppendToResponse as BaseAppendToResponse;
 
+/**
+ * Class AppendToResponse
+ * @package Tmdb\Model\Tv\Episode\QueryParameter
+ */
 class AppendToResponse extends BaseAppendToResponse {
     const CREDITS      = 'credits';
     const EXTERNAL_IDS = 'external_ids';
diff --git a/lib/Tmdb/Model/Tv/Network.php b/lib/Tmdb/Model/Tv/Network.php
index e83e3f88..c4c4be65 100644
--- a/lib/Tmdb/Model/Tv/Network.php
+++ b/lib/Tmdb/Model/Tv/Network.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\AbstractModel;
 
+/**
+ * Class Network
+ * @package Tmdb\Model\Tv
+ */
 class Network extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Tv/QueryParameter/AppendToResponse.php b/lib/Tmdb/Model/Tv/QueryParameter/AppendToResponse.php
index a7ff90d9..f74fd6b5 100644
--- a/lib/Tmdb/Model/Tv/QueryParameter/AppendToResponse.php
+++ b/lib/Tmdb/Model/Tv/QueryParameter/AppendToResponse.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Common\QueryParameter\AppendToResponse as BaseAppendToResponse;
 
+/**
+ * Class AppendToResponse
+ * @package Tmdb\Model\Tv\QueryParameter
+ */
 class AppendToResponse extends BaseAppendToResponse {
     const CREDITS       = 'credits';
     const EXTERNAL_IDS  = 'external_ids';
diff --git a/lib/Tmdb/Model/Tv/Season.php b/lib/Tmdb/Model/Tv/Season.php
index f9436fec..74a60edd 100644
--- a/lib/Tmdb/Model/Tv/Season.php
+++ b/lib/Tmdb/Model/Tv/Season.php
@@ -19,6 +19,10 @@
 use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Image\PosterImage;
 
+/**
+ * Class Season
+ * @package Tmdb\Model\Tv
+ */
 class Season extends AbstractModel {
 
     /**
diff --git a/lib/Tmdb/Model/Tv/Season/QueryParameter/AppendToResponse.php b/lib/Tmdb/Model/Tv/Season/QueryParameter/AppendToResponse.php
index 2455f63c..5a98bb92 100644
--- a/lib/Tmdb/Model/Tv/Season/QueryParameter/AppendToResponse.php
+++ b/lib/Tmdb/Model/Tv/Season/QueryParameter/AppendToResponse.php
@@ -14,6 +14,10 @@
 
 use Tmdb\Model\Common\QueryParameter\AppendToResponse as BaseAppendToResponse;
 
+/**
+ * Class AppendToResponse
+ * @package Tmdb\Model\Tv\Season\QueryParameter
+ */
 class AppendToResponse extends BaseAppendToResponse {
     const CREDITS      = 'credits';
     const EXTERNAL_IDS = 'external_ids';
diff --git a/lib/Tmdb/Repository/AbstractRepository.php b/lib/Tmdb/Repository/AbstractRepository.php
index d8ac7a55..3909cac0 100644
--- a/lib/Tmdb/Repository/AbstractRepository.php
+++ b/lib/Tmdb/Repository/AbstractRepository.php
@@ -17,6 +17,10 @@
 use Tmdb\Factory\FactoryInterface;
 use Tmdb\Model\Common\QueryParameter\QueryParameterInterface;
 
+/**
+ * Class AbstractRepository
+ * @package Tmdb\Repository
+ */
 abstract class AbstractRepository {
 
     protected $client  = null;
diff --git a/lib/Tmdb/RequestToken.php b/lib/Tmdb/RequestToken.php
index 5c1215a6..2968fca8 100644
--- a/lib/Tmdb/RequestToken.php
+++ b/lib/Tmdb/RequestToken.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb;
 
+/**
+ * Class RequestToken
+ * @package Tmdb
+ */
 class RequestToken {
     /**
      * The token for obtaining a session
diff --git a/lib/Tmdb/SessionToken.php b/lib/Tmdb/SessionToken.php
index 7ef9b638..8af98252 100644
--- a/lib/Tmdb/SessionToken.php
+++ b/lib/Tmdb/SessionToken.php
@@ -12,6 +12,10 @@
  */
 namespace Tmdb;
 
+/**
+ * Class SessionToken
+ * @package Tmdb
+ */
 class SessionToken {
     /**
      * @var string