diff --git a/docs/api.rst b/docs/api.rst
index 8c086fa..22baf53 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -34,9 +34,19 @@ API Reference
     :members:
     :undoc-members:
 
+.. autoclass:: Media
+    :members:
+    :undoc-members:
+
 .. autoclass:: Track
     :members:
     :undoc-members:
+    :show-inheritance:
+
+.. autoclass:: Video
+    :members:
+    :undoc-members:
+    :show-inheritance:
 
 .. autoclass:: Playlist
     :members:
diff --git a/docs/conf.py b/docs/conf.py
index 0f3b0d8..8f37ea2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,14 +53,14 @@
 
 # General information about the project.
 project = u'tidalapi'
-copyright = u'2014, Thomas Amland'
+copyright = u'2014-2019, Thomas Amland, morguldir'
 
 # The version info for the project you're documenting, acts as replacement
 # for |version| and |release|, also used in various other places throughout
 # the built documents.
 #
 # The short X.Y version.
-version = '0.5.0'
+version = '0.6.0'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/setup.py b/setup.py
index 27df663..6acdfda 100644
--- a/setup.py
+++ b/setup.py
@@ -18,11 +18,11 @@
 
 setup(
     name='tidalapi',
-    version='0.5.0',
+    version='0.6.0',
     description='Unofficial API for TIDAL music streaming service.',
     long_description=long_description,
-    author='Thomas Amland',
-    author_email='thomas.amland@googlemail.com',
+    author='Thomas Amland, morguldir',
+    author_email='thomas.amland@googlemail.com, morguldir@protonmail.com',
     url='https://github.com/tamland/tidalapi',
     license='LGPL',
     packages=['tidalapi'],
@@ -33,10 +33,10 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)',
         "Programming Language :: Python :: 2",
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ],
 )
diff --git a/tests/test_api.py b/tests/test_api.py
index 18e846a..57f7496 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #
+# Copyright (C) 2019 morguldir
 # Copyright (C) 2014 Thomas Amland
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/tidalapi/__init__.py b/tidalapi/__init__.py
index fd9dc68..b4f279d 100644
--- a/tidalapi/__init__.py
+++ b/tidalapi/__init__.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #
+# Copyright (C) 2019 morguldir
 # Copyright (C) 2014 Thomas Amland
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/tidalapi/models.py b/tidalapi/models.py
index 9931687..8a73049 100644
--- a/tidalapi/models.py
+++ b/tidalapi/models.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #
+# Copyright (C) 2019 morguldir
 # Copyright (C) 2014 Thomas Amland
 #
 # This program is free software: you can redistribute it and/or modify