diff --git a/docs/build/doctrees/commands.doctree b/docs/build/doctrees/commands.doctree
index 073603e..f90228f 100644
Binary files a/docs/build/doctrees/commands.doctree and b/docs/build/doctrees/commands.doctree differ
diff --git a/docs/build/doctrees/configuration.doctree b/docs/build/doctrees/configuration.doctree
index fd5e76f..d19b551 100644
Binary files a/docs/build/doctrees/configuration.doctree and b/docs/build/doctrees/configuration.doctree differ
diff --git a/docs/build/doctrees/environment.pickle b/docs/build/doctrees/environment.pickle
index 4820947..68ba116 100644
Binary files a/docs/build/doctrees/environment.pickle and b/docs/build/doctrees/environment.pickle differ
diff --git a/docs/build/doctrees/index.doctree b/docs/build/doctrees/index.doctree
index 7300586..17b0b10 100644
Binary files a/docs/build/doctrees/index.doctree and b/docs/build/doctrees/index.doctree differ
diff --git a/docs/build/doctrees/installation.doctree b/docs/build/doctrees/installation.doctree
index 548b901..70d09aa 100644
Binary files a/docs/build/doctrees/installation.doctree and b/docs/build/doctrees/installation.doctree differ
diff --git a/docs/build/doctrees/media.doctree b/docs/build/doctrees/media.doctree
index 5fd6b84..2287229 100644
Binary files a/docs/build/doctrees/media.doctree and b/docs/build/doctrees/media.doctree differ
diff --git a/docs/build/doctrees/mediable.doctree b/docs/build/doctrees/mediable.doctree
index 65bd979..6716d9c 100644
Binary files a/docs/build/doctrees/mediable.doctree and b/docs/build/doctrees/mediable.doctree differ
diff --git a/docs/build/doctrees/types.doctree b/docs/build/doctrees/types.doctree
index 2d97ded..4e2b0cf 100644
Binary files a/docs/build/doctrees/types.doctree and b/docs/build/doctrees/types.doctree differ
diff --git a/docs/build/doctrees/uploader.doctree b/docs/build/doctrees/uploader.doctree
index a8a357e..19dcbc6 100644
Binary files a/docs/build/doctrees/uploader.doctree and b/docs/build/doctrees/uploader.doctree differ
diff --git a/docs/build/html/.buildinfo b/docs/build/html/.buildinfo
index 717ba21..49bb039 100644
--- a/docs/build/html/.buildinfo
+++ b/docs/build/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 2722b2b5df7612bff4385ecba0d7e59f
+config: bbf7cac85fbbf9441e0e7eba39880a50
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/build/html/_sources/configuration.txt b/docs/build/html/_sources/configuration.txt
index ab60e27..25fed20 100644
--- a/docs/build/html/_sources/configuration.txt
+++ b/docs/build/html/_sources/configuration.txt
@@ -14,6 +14,7 @@ An example setup with one private disk (``local``) and one publicly accessible d
 
 ::
 
+    <?php
     //...
     'disks' => [
         'local' => [
@@ -33,6 +34,7 @@ Once you have set up as many disks as you need, edit ``config/mediable.php`` to
 
 ::
 
+    <?php
     //...
     /*
      * Filesystem disk to use if none is specified
@@ -47,6 +49,85 @@ Once you have set up as many disks as you need, edit ``config/mediable.php`` to
     ],
     //...
 
+
+Disk Visibility
+^^^^^^^^^^^^^^^
+
+This package is able to generate public URLs for accessing media, and uses the disk config to determine how this should be done.
+
+URLs can always be generated for ``Media`` placed on a disk located below the webroot.
+
+::
+
+    <?php
+    'disks' => [
+        'uploads' => [
+            'driver' => 'local',
+            'root' => public_path('uploads'),
+        ],
+    ]
+
+    //...
+
+    $media->getUrl(); // returns http://domain.com/uploads/foo.jpg
+
+``Media`` placed on a disk located elsewhere will throw an exception.
+
+::
+
+    <?php
+    'disks' => [
+        'private' => [
+            'driver' => 'local',
+            'root' => storage_path('private'),
+        ],
+    ]
+
+    //...
+
+    $media->getUrl(); // Throws a Plank\Mediable\Exceptions\MediableUrlException
+
+If you are using symbolic links to make local disks accessible, you can instruct the package to generate URLs with the ``'visibility' => 'public'`` key. By default, the package will assume that the symlink is named ``'storage'``, as per `laravel's documentation <https://laravel.com/docs/5.3/filesystem#the-public-disk>`_. This can be modified with the ``'prefix'`` key.
+
+::
+
+    <?php
+    'disks' => [
+        'public' => [
+            'driver' => 'local',
+            'root' => storage_path('public'),
+            'visibility' => 'public',
+            'prefix' => 'assets'
+        ],
+    ]
+
+    //...
+
+    $media->getUrl(); // returns http://domain.com/assets/foo.jpg
+
+
+Permissions for S3-based disks is set on the buckets themselves. You can inform the package that ``Media`` on an S3 disk can be linked by URL by adding the ``'visibility' => 'public'`` key to the disk congfig.
+
+::
+
+    <?php
+    'disks' => [
+        'cloud' => [
+            'driver' => 's3',
+            'key'    => env('S3_KEY'),
+            'secret' => env('S3_SECRET'),
+            'region' => env('S3_REGION'),
+            'bucket' => env('S3_BUCKET'),
+            'version' => 'latest',
+            'visibility' => 'public'
+        ],
+    ]
+
+    //...
+
+    $media->getUrl(); // returns https://s3.amazonaws.com/bucket/foo.jpg
+
+
 .. _validation:
 
 Validation
@@ -56,6 +137,7 @@ The `config/mediable.php` offers a number of options for configuring how media u
 
 ::
 
+    <?php
     //...
     /*
      * The maximum file size in bytes for a single uploaded file
@@ -106,10 +188,11 @@ Aggregate Types
 
 Laravel-Mediable provides functionality for handling multiple kinds of files under a shared aggregate type. This is intended to make it easy to find similar media without needing to constantly juggle multiple MIME types or file extensions.
 
-The package defines a number of common file types in the config file (config/mediable.php). Feel free to modify the default types provided by the package or add your own. Each aggregate type requires a key used to identify the type and a list of MIME types and file extensions that should be recognized as belonging to that aggregate type. For example, if you wanted to add an aggregate type for different types of markup, you could do the following.
+The package defines a number of common file types in the config file (``config/mediable.php``). Feel free to modify the default types provided by the package or add your own. Each aggregate type requires a key used to identify the type and a list of MIME types and file extensions that should be recognized as belonging to that aggregate type. For example, if you wanted to add an aggregate type for different types of markup, you could do the following.
 
 ::
 
+    <?php
     //...
     'aggregate_types' => [
         //...
@@ -145,6 +228,7 @@ The ``config/mediable.php`` file lets you specify a number of classes to be use
 
 ::
 
+    <?php
     /*
      * FQCN of the model to use for media
      *
diff --git a/docs/build/html/_sources/mediable.txt b/docs/build/html/_sources/mediable.txt
index 9540d67..ae809a8 100644
--- a/docs/build/html/_sources/mediable.txt
+++ b/docs/build/html/_sources/mediable.txt
@@ -72,7 +72,7 @@ You can retrieve media attached to a file by refering to the tag to which it was
     <?php
     $media = $post->getMedia('thumbnail');
 
-This returns a collection of all media assigned to that tag. In cases where you only need one `Media` entity, you can instead use `firstMedia()`.
+This returns a collection of all media assigned to that tag. In cases where you only need one ``Media`` entity, you can instead use ``firstMedia()``.
 
 ::
 
diff --git a/docs/build/html/commands.html b/docs/build/html/commands.html
index 124da73..046dc5b 100644
--- a/docs/build/html/commands.html
+++ b/docs/build/html/commands.html
@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Artisan Commands &mdash; Laravel-Mediable 2.0.0 documentation</title>
+  <title>Artisan Commands &mdash; Laravel-Mediable 2.2.0 documentation</title>
   
 
   
@@ -30,7 +30,7 @@
   
 
   
-    <link rel="top" title="Laravel-Mediable 2.0.0 documentation" href="index.html"/>
+    <link rel="top" title="Laravel-Mediable 2.2.0 documentation" href="index.html"/>
         <link rel="prev" title="Aggregate Types" href="types.html"/> 
 
   
@@ -59,7 +59,7 @@
             
             
               <div class="version">
-                2.0.0
+                2.2.0
               </div>
             
           
@@ -192,7 +192,7 @@ <h1>Artisan Commands<a class="headerlink" href="#artisan-commands" title="Permal
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'2.0.0',
+            VERSION:'2.2.0',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/build/html/configuration.html b/docs/build/html/configuration.html
index ab6d61b..3045652 100644
--- a/docs/build/html/configuration.html
+++ b/docs/build/html/configuration.html
@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Configuration &mdash; Laravel-Mediable 2.0.0 documentation</title>
+  <title>Configuration &mdash; Laravel-Mediable 2.2.0 documentation</title>
   
 
   
@@ -30,7 +30,7 @@
   
 
   
-    <link rel="top" title="Laravel-Mediable 2.0.0 documentation" href="index.html"/>
+    <link rel="top" title="Laravel-Mediable 2.2.0 documentation" href="index.html"/>
         <link rel="next" title="Uploading Files" href="uploader.html"/>
         <link rel="prev" title="Installation" href="installation.html"/> 
 
@@ -60,7 +60,7 @@
             
             
               <div class="version">
-                2.0.0
+                2.2.0
               </div>
             
           
@@ -85,7 +85,10 @@
 <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="installation.html">Installation</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Configuration</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="#disks">Disks</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#disks">Disks</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#disk-visibility">Disk Visibility</a></li>
+</ul>
+</li>
 <li class="toctree-l2"><a class="reference internal" href="#validation">Validation</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#aggregate-types">Aggregate Types</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#extending-functionality">Extending functionality</a></li>
@@ -149,112 +152,183 @@ <h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to
 <span id="id1"></span><h2>Disks<a class="headerlink" href="#disks" title="Permalink to this headline">¶</a></h2>
 <p>Laravel-Mediable is built on top of Laravel&#8217;s Filesystem component. Before you use the package, you will need to configure the filesystem disks where you would like files to be stored in <code class="docutils literal"><span class="pre">config/filesystems.php</span></code>. <a class="reference external" href="https://laravel.com/docs/5.2/filesystem">Learn more about filesystem disk</a>.</p>
 <p>An example setup with one private disk (<code class="docutils literal"><span class="pre">local</span></code>) and one publicly accessible disk (<code class="docutils literal"><span class="pre">uploads</span></code>):</p>
-<div class="highlight-php"><div class="highlight"><pre><span></span><span class="x">//...</span>
-<span class="x">&#39;disks&#39; =&gt; [</span>
-<span class="x">    &#39;local&#39; =&gt; [</span>
-<span class="x">        &#39;driver&#39; =&gt; &#39;local&#39;,</span>
-<span class="x">        &#39;root&#39;   =&gt; storage_path(&#39;app&#39;),</span>
-<span class="x">    ],</span>
-
-<span class="x">    &#39;uploads&#39; =&gt; [</span>
-<span class="x">        &#39;driver&#39; =&gt; &#39;local&#39;,</span>
-<span class="x">        &#39;root&#39;   =&gt; public_path(&#39;uploads&#39;),</span>
-<span class="x">    ],</span>
-<span class="x">]</span>
-<span class="x">//...</span>
+<div class="highlight-php"><div class="highlight"><pre><span></span><span class="cp">&lt;?php</span>
+<span class="c1">//...</span>
+<span class="s1">&#39;disks&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+    <span class="s1">&#39;local&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+        <span class="s1">&#39;driver&#39;</span> <span class="o">=&gt;</span> <span class="s1">&#39;local&#39;</span><span class="p">,</span>
+        <span class="s1">&#39;root&#39;</span>   <span class="o">=&gt;</span> <span class="nx">storage_path</span><span class="p">(</span><span class="s1">&#39;app&#39;</span><span class="p">),</span>
+    <span class="p">],</span>
+
+    <span class="s1">&#39;uploads&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+        <span class="s1">&#39;driver&#39;</span> <span class="o">=&gt;</span> <span class="s1">&#39;local&#39;</span><span class="p">,</span>
+        <span class="s1">&#39;root&#39;</span>   <span class="o">=&gt;</span> <span class="nx">public_path</span><span class="p">(</span><span class="s1">&#39;uploads&#39;</span><span class="p">),</span>
+    <span class="p">],</span>
+<span class="p">]</span>
+<span class="c1">//...</span>
 </pre></div>
 </div>
 <p>Once you have set up as many disks as you need, edit <code class="docutils literal"><span class="pre">config/mediable.php</span></code> to authorize the package to use the disks you have created.</p>
-<div class="highlight-php"><div class="highlight"><pre><span></span><span class="x">//...</span>
-<span class="x">/*</span>
-<span class="x"> * Filesystem disk to use if none is specified</span>
-<span class="x"> */</span>
-<span class="x">&#39;default_disk&#39; =&gt; &#39;uploads&#39;,</span>
-
-<span class="x">/*</span>
-<span class="x"> * Filesystems that can be used for media storage</span>
-<span class="x"> */</span>
-<span class="x">&#39;allowed_disks&#39; =&gt; [</span>
-<span class="x">    &#39;uploads&#39;,</span>
-<span class="x">],</span>
-<span class="x">//...</span>
+<div class="highlight-php"><div class="highlight"><pre><span></span><span class="cp">&lt;?php</span>
+<span class="c1">//...</span>
+<span class="cm">/*</span>
+<span class="cm"> * Filesystem disk to use if none is specified</span>
+<span class="cm"> */</span>
+<span class="s1">&#39;default_disk&#39;</span> <span class="o">=&gt;</span> <span class="s1">&#39;uploads&#39;</span><span class="p">,</span>
+
+<span class="cm">/*</span>
+<span class="cm"> * Filesystems that can be used for media storage</span>
+<span class="cm"> */</span>
+<span class="s1">&#39;allowed_disks&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+    <span class="s1">&#39;uploads&#39;</span><span class="p">,</span>
+<span class="p">],</span>
+<span class="c1">//...</span>
+</pre></div>
+</div>
+<div class="section" id="disk-visibility">
+<h3>Disk Visibility<a class="headerlink" href="#disk-visibility" title="Permalink to this headline">¶</a></h3>
+<p>This package is able to generate public URLs for accessing media, and uses the disk config to determine how this should be done.</p>
+<p>URLs can always be generated for <code class="docutils literal"><span class="pre">Media</span></code> placed on a disk located below the webroot.</p>
+<div class="highlight-php"><div class="highlight"><pre><span></span><span class="cp">&lt;?php</span>
+<span class="s1">&#39;disks&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+    <span class="s1">&#39;uploads&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+        <span class="s1">&#39;driver&#39;</span> <span class="o">=&gt;</span> <span class="s1">&#39;local&#39;</span><span class="p">,</span>
+        <span class="s1">&#39;root&#39;</span> <span class="o">=&gt;</span> <span class="nx">public_path</span><span class="p">(</span><span class="s1">&#39;uploads&#39;</span><span class="p">),</span>
+    <span class="p">],</span>
+<span class="p">]</span>
+
+<span class="c1">//...</span>
+
+<span class="nv">$media</span><span class="o">-&gt;</span><span class="na">getUrl</span><span class="p">();</span> <span class="c1">// returns http://domain.com/uploads/foo.jpg</span>
+</pre></div>
+</div>
+<p><code class="docutils literal"><span class="pre">Media</span></code> placed on a disk located elsewhere will throw an exception.</p>
+<div class="highlight-php"><div class="highlight"><pre><span></span><span class="cp">&lt;?php</span>
+<span class="s1">&#39;disks&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+    <span class="s1">&#39;private&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+        <span class="s1">&#39;driver&#39;</span> <span class="o">=&gt;</span> <span class="s1">&#39;local&#39;</span><span class="p">,</span>
+        <span class="s1">&#39;root&#39;</span> <span class="o">=&gt;</span> <span class="nx">storage_path</span><span class="p">(</span><span class="s1">&#39;private&#39;</span><span class="p">),</span>
+    <span class="p">],</span>
+<span class="p">]</span>
+
+<span class="c1">//...</span>
+
+<span class="nv">$media</span><span class="o">-&gt;</span><span class="na">getUrl</span><span class="p">();</span> <span class="c1">// Throws a Plank\Mediable\Exceptions\MediableUrlException</span>
 </pre></div>
 </div>
+<p>If you are using symbolic links to make local disks accessible, you can instruct the package to generate URLs with the <code class="docutils literal"><span class="pre">'visibility'</span> <span class="pre">=&gt;</span> <span class="pre">'public'</span></code> key. By default, the package will assume that the symlink is named <code class="docutils literal"><span class="pre">'storage'</span></code>, as per <a class="reference external" href="https://laravel.com/docs/5.3/filesystem#the-public-disk">laravel&#8217;s documentation</a>. This can be modified with the <code class="docutils literal"><span class="pre">'prefix'</span></code> key.</p>
+<div class="highlight-php"><div class="highlight"><pre><span></span><span class="cp">&lt;?php</span>
+<span class="s1">&#39;disks&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+    <span class="s1">&#39;public&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+        <span class="s1">&#39;driver&#39;</span> <span class="o">=&gt;</span> <span class="s1">&#39;local&#39;</span><span class="p">,</span>
+        <span class="s1">&#39;root&#39;</span> <span class="o">=&gt;</span> <span class="nx">storage_path</span><span class="p">(</span><span class="s1">&#39;public&#39;</span><span class="p">),</span>
+        <span class="s1">&#39;visibility&#39;</span> <span class="o">=&gt;</span> <span class="s1">&#39;public&#39;</span><span class="p">,</span>
+        <span class="s1">&#39;prefix&#39;</span> <span class="o">=&gt;</span> <span class="s1">&#39;assets&#39;</span>
+    <span class="p">],</span>
+<span class="p">]</span>
+
+<span class="c1">//...</span>
+
+<span class="nv">$media</span><span class="o">-&gt;</span><span class="na">getUrl</span><span class="p">();</span> <span class="c1">// returns http://domain.com/assets/foo.jpg</span>
+</pre></div>
+</div>
+<p>Permissions for S3-based disks is set on the buckets themselves. You can inform the package that <code class="docutils literal"><span class="pre">Media</span></code> on an S3 disk can be linked by URL by adding the <code class="docutils literal"><span class="pre">'visibility'</span> <span class="pre">=&gt;</span> <span class="pre">'public'</span></code> key to the disk congfig.</p>
+<div class="highlight-php"><div class="highlight"><pre><span></span><span class="cp">&lt;?php</span>
+<span class="s1">&#39;disks&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+    <span class="s1">&#39;cloud&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+        <span class="s1">&#39;driver&#39;</span> <span class="o">=&gt;</span> <span class="s1">&#39;s3&#39;</span><span class="p">,</span>
+        <span class="s1">&#39;key&#39;</span>    <span class="o">=&gt;</span> <span class="nx">env</span><span class="p">(</span><span class="s1">&#39;S3_KEY&#39;</span><span class="p">),</span>
+        <span class="s1">&#39;secret&#39;</span> <span class="o">=&gt;</span> <span class="nx">env</span><span class="p">(</span><span class="s1">&#39;S3_SECRET&#39;</span><span class="p">),</span>
+        <span class="s1">&#39;region&#39;</span> <span class="o">=&gt;</span> <span class="nx">env</span><span class="p">(</span><span class="s1">&#39;S3_REGION&#39;</span><span class="p">),</span>
+        <span class="s1">&#39;bucket&#39;</span> <span class="o">=&gt;</span> <span class="nx">env</span><span class="p">(</span><span class="s1">&#39;S3_BUCKET&#39;</span><span class="p">),</span>
+        <span class="s1">&#39;version&#39;</span> <span class="o">=&gt;</span> <span class="s1">&#39;latest&#39;</span><span class="p">,</span>
+        <span class="s1">&#39;visibility&#39;</span> <span class="o">=&gt;</span> <span class="s1">&#39;public&#39;</span>
+    <span class="p">],</span>
+<span class="p">]</span>
+
+<span class="c1">//...</span>
+
+<span class="nv">$media</span><span class="o">-&gt;</span><span class="na">getUrl</span><span class="p">();</span> <span class="c1">// returns https://s3.amazonaws.com/bucket/foo.jpg</span>
+</pre></div>
+</div>
+</div>
 </div>
 <div class="section" id="validation">
 <span id="id2"></span><h2>Validation<a class="headerlink" href="#validation" title="Permalink to this headline">¶</a></h2>
 <p>The <cite>config/mediable.php</cite> offers a number of options for configuring how media uploads are validated. These values serve as defaults, which can be overridden on a case-by-case basis for each <code class="docutils literal"><span class="pre">MediaUploader</span></code> instance.</p>
-<div class="highlight-php"><div class="highlight"><pre><span></span><span class="x">//...</span>
-<span class="x">/*</span>
-<span class="x"> * The maximum file size in bytes for a single uploaded file</span>
-<span class="x"> */</span>
-<span class="x">&#39;max_size&#39; =&gt; 1024 * 1024 * 10,</span>
-
-<span class="x">/*</span>
-<span class="x"> * What to do if a duplicate file is uploaded. Options include:</span>
-<span class="x"> *</span>
-<span class="x"> * * &#39;increment&#39;: the new file&#39;s name is given an incrementing suffix</span>
-<span class="x"> * * &#39;replace&#39; : the old file and media model is deleted</span>
-<span class="x"> * * &#39;error&#39;: an Exception is thrown</span>
-<span class="x"> *</span>
-<span class="x"> */</span>
-<span class="x">&#39;on_duplicate&#39; =&gt; Plank\Mediable\MediaUploader::ON_DUPLICATE_INCREMENT,</span>
-
-<span class="x">/*</span>
-<span class="x"> * Reject files unless both their mime and extension are recognized and both match a single aggregate type</span>
-<span class="x"> */</span>
-<span class="x">&#39;strict_type_checking&#39; =&gt; false,</span>
-
-<span class="x">/*</span>
-<span class="x"> * Reject files whose mime type or extension is not recognized</span>
-<span class="x"> * if true, files will be given a type of `&#39;other&#39;`</span>
-<span class="x"> */</span>
-<span class="x">&#39;allow_unrecognized_types&#39; =&gt; false,</span>
-
-<span class="x">/*</span>
-<span class="x"> * Only allow files with specific MIME type(s) to be uploaded</span>
-<span class="x"> */</span>
-<span class="x">&#39;allowed_mime_types&#39; =&gt; [],</span>
-
-<span class="x">/*</span>
-<span class="x"> * Only allow files with specific file extension(s) to be uploaded</span>
-<span class="x"> */</span>
-<span class="x">&#39;allowed_extensions&#39; =&gt; [],</span>
-
-<span class="x">/*</span>
-<span class="x"> * Only allow files matching specific aggregate type(s) to be uploaded</span>
-<span class="x"> */</span>
-<span class="x">&#39;allowed_aggregate_types&#39; =&gt; [],</span>
-<span class="x">//...</span>
+<div class="highlight-php"><div class="highlight"><pre><span></span><span class="cp">&lt;?php</span>
+<span class="c1">//...</span>
+<span class="cm">/*</span>
+<span class="cm"> * The maximum file size in bytes for a single uploaded file</span>
+<span class="cm"> */</span>
+<span class="s1">&#39;max_size&#39;</span> <span class="o">=&gt;</span> <span class="mi">1024</span> <span class="o">*</span> <span class="mi">1024</span> <span class="o">*</span> <span class="mi">10</span><span class="p">,</span>
+
+<span class="cm">/*</span>
+<span class="cm"> * What to do if a duplicate file is uploaded. Options include:</span>
+<span class="cm"> *</span>
+<span class="cm"> * * &#39;increment&#39;: the new file&#39;s name is given an incrementing suffix</span>
+<span class="cm"> * * &#39;replace&#39; : the old file and media model is deleted</span>
+<span class="cm"> * * &#39;error&#39;: an Exception is thrown</span>
+<span class="cm"> *</span>
+<span class="cm"> */</span>
+<span class="s1">&#39;on_duplicate&#39;</span> <span class="o">=&gt;</span> <span class="nx">Plank\Mediable\MediaUploader</span><span class="o">::</span><span class="na">ON_DUPLICATE_INCREMENT</span><span class="p">,</span>
+
+<span class="cm">/*</span>
+<span class="cm"> * Reject files unless both their mime and extension are recognized and both match a single aggregate type</span>
+<span class="cm"> */</span>
+<span class="s1">&#39;strict_type_checking&#39;</span> <span class="o">=&gt;</span> <span class="k">false</span><span class="p">,</span>
+
+<span class="cm">/*</span>
+<span class="cm"> * Reject files whose mime type or extension is not recognized</span>
+<span class="cm"> * if true, files will be given a type of `&#39;other&#39;`</span>
+<span class="cm"> */</span>
+<span class="s1">&#39;allow_unrecognized_types&#39;</span> <span class="o">=&gt;</span> <span class="k">false</span><span class="p">,</span>
+
+<span class="cm">/*</span>
+<span class="cm"> * Only allow files with specific MIME type(s) to be uploaded</span>
+<span class="cm"> */</span>
+<span class="s1">&#39;allowed_mime_types&#39;</span> <span class="o">=&gt;</span> <span class="p">[],</span>
+
+<span class="cm">/*</span>
+<span class="cm"> * Only allow files with specific file extension(s) to be uploaded</span>
+<span class="cm"> */</span>
+<span class="s1">&#39;allowed_extensions&#39;</span> <span class="o">=&gt;</span> <span class="p">[],</span>
+
+<span class="cm">/*</span>
+<span class="cm"> * Only allow files matching specific aggregate type(s) to be uploaded</span>
+<span class="cm"> */</span>
+<span class="s1">&#39;allowed_aggregate_types&#39;</span> <span class="o">=&gt;</span> <span class="p">[],</span>
+<span class="c1">//...</span>
 </pre></div>
 </div>
 </div>
 <div class="section" id="aggregate-types">
 <span id="id3"></span><h2>Aggregate Types<a class="headerlink" href="#aggregate-types" title="Permalink to this headline">¶</a></h2>
 <p>Laravel-Mediable provides functionality for handling multiple kinds of files under a shared aggregate type. This is intended to make it easy to find similar media without needing to constantly juggle multiple MIME types or file extensions.</p>
-<p>The package defines a number of common file types in the config file (config/mediable.php). Feel free to modify the default types provided by the package or add your own. Each aggregate type requires a key used to identify the type and a list of MIME types and file extensions that should be recognized as belonging to that aggregate type. For example, if you wanted to add an aggregate type for different types of markup, you could do the following.</p>
-<div class="highlight-php"><div class="highlight"><pre><span></span><span class="x">//...</span>
-<span class="x">&#39;aggregate_types&#39; =&gt; [</span>
-<span class="x">    //...</span>
-<span class="x">    &#39;markup&#39; =&gt; [</span>
-<span class="x">        &#39;mime_types&#39; =&gt; [</span>
-<span class="x">            &#39;text/markdown&#39;,</span>
-<span class="x">            &#39;text/html&#39;,</span>
-<span class="x">            &#39;text/xml&#39;,</span>
-<span class="x">            &#39;application/xml&#39;,</span>
-<span class="x">            &#39;application/xhtml+xml&#39;,</span>
-<span class="x">        ],</span>
-<span class="x">        &#39;extensions&#39; =&gt; [</span>
-<span class="x">            &#39;md&#39;,</span>
-<span class="x">            &#39;html&#39;,</span>
-<span class="x">            &#39;htm&#39;,</span>
-<span class="x">            &#39;xhtml&#39;,</span>
-<span class="x">            &#39;xml&#39;</span>
-<span class="x">        ]</span>
-<span class="x">    ],</span>
-<span class="x">    //...</span>
-<span class="x">]</span>
-<span class="x">//...</span>
+<p>The package defines a number of common file types in the config file (<code class="docutils literal"><span class="pre">config/mediable.php</span></code>). Feel free to modify the default types provided by the package or add your own. Each aggregate type requires a key used to identify the type and a list of MIME types and file extensions that should be recognized as belonging to that aggregate type. For example, if you wanted to add an aggregate type for different types of markup, you could do the following.</p>
+<div class="highlight-php"><div class="highlight"><pre><span></span><span class="cp">&lt;?php</span>
+<span class="c1">//...</span>
+<span class="s1">&#39;aggregate_types&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+    <span class="c1">//...</span>
+    <span class="s1">&#39;markup&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+        <span class="s1">&#39;mime_types&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+            <span class="s1">&#39;text/markdown&#39;</span><span class="p">,</span>
+            <span class="s1">&#39;text/html&#39;</span><span class="p">,</span>
+            <span class="s1">&#39;text/xml&#39;</span><span class="p">,</span>
+            <span class="s1">&#39;application/xml&#39;</span><span class="p">,</span>
+            <span class="s1">&#39;application/xhtml+xml&#39;</span><span class="p">,</span>
+        <span class="p">],</span>
+        <span class="s1">&#39;extensions&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+            <span class="s1">&#39;md&#39;</span><span class="p">,</span>
+            <span class="s1">&#39;html&#39;</span><span class="p">,</span>
+            <span class="s1">&#39;htm&#39;</span><span class="p">,</span>
+            <span class="s1">&#39;xhtml&#39;</span><span class="p">,</span>
+            <span class="s1">&#39;xml&#39;</span>
+        <span class="p">]</span>
+    <span class="p">],</span>
+    <span class="c1">//...</span>
+<span class="p">]</span>
+<span class="c1">//...</span>
 </pre></div>
 </div>
 <p>Note: a MIME type or extension could be present in more than one aggregate type&#8217;s definitions (the system will try to find the best match), but each Media record can only have one aggregate type.</p>
@@ -262,36 +336,37 @@ <h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to
 <div class="section" id="extending-functionality">
 <span id="id4"></span><h2>Extending functionality<a class="headerlink" href="#extending-functionality" title="Permalink to this headline">¶</a></h2>
 <p>The <code class="docutils literal"><span class="pre">config/mediable.php</span></code> file lets you specify a number of classes to be use for internal behaviour. This is to allow for extending some of the the default classes used by the package or to cover additional use cases.</p>
-<div class="highlight-php"><div class="highlight"><pre><span></span><span class="x">/*</span>
-<span class="x"> * FQCN of the model to use for media</span>
-<span class="x"> *</span>
-<span class="x"> * Should extend Plank\Mediable\Media::class</span>
-<span class="x"> */</span>
-<span class="x">&#39;model&#39; =&gt; Plank\Mediable\Media::class,</span>
-
-<span class="x">/*</span>
-<span class="x"> * List of adapters to use for various source inputs</span>
-<span class="x"> *</span>
-<span class="x"> * Adapters can map either to a class or a pattern (regex)</span>
-<span class="x"> */</span>
-<span class="x">&#39;source_adapters&#39; =&gt; [</span>
-<span class="x">    &#39;class&#39; =&gt; [</span>
-<span class="x">        Symfony\Component\HttpFoundation\File\UploadedFile::class =&gt; Plank\Mediable\SourceAdapters\UploadedFileAdapter::class,</span>
-<span class="x">        Symfony\Component\HttpFoundation\File\File::class =&gt; Plank\Mediable\SourceAdapters\FileAdapter::class,</span>
-<span class="x">    ],</span>
-<span class="x">    &#39;pattern&#39; =&gt; [</span>
-<span class="x">        &#39;^https?://&#39; =&gt; Plank\Mediable\SourceAdapters\RemoteUrlAdapter::class,</span>
-<span class="x">        &#39;^/&#39; =&gt; Plank\Mediable\SourceAdapters\LocalPathAdapter::class</span>
-<span class="x">    ],</span>
-<span class="x">],</span>
-
-<span class="x">/*</span>
-<span class="x"> * List of URL Generators to use for handling various filesystem disks</span>
-<span class="x"> */</span>
-<span class="x">&#39;url_generators&#39; =&gt; [</span>
-<span class="x">    &#39;local&#39; =&gt; Plank\Mediable\UrlGenerators\LocalUrlGenerator::class,</span>
-<span class="x">    &#39;s3&#39; =&gt; Plank\Mediable\UrlGenerators\S3UrlGenerator::class,</span>
-<span class="x">],</span>
+<div class="highlight-php"><div class="highlight"><pre><span></span><span class="cp">&lt;?php</span>
+<span class="cm">/*</span>
+<span class="cm"> * FQCN of the model to use for media</span>
+<span class="cm"> *</span>
+<span class="cm"> * Should extend Plank\Mediable\Media::class</span>
+<span class="cm"> */</span>
+<span class="s1">&#39;model&#39;</span> <span class="o">=&gt;</span> <span class="nx">Plank\Mediable\Media</span><span class="o">::</span><span class="na">class</span><span class="p">,</span>
+
+<span class="cm">/*</span>
+<span class="cm"> * List of adapters to use for various source inputs</span>
+<span class="cm"> *</span>
+<span class="cm"> * Adapters can map either to a class or a pattern (regex)</span>
+<span class="cm"> */</span>
+<span class="s1">&#39;source_adapters&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+    <span class="s1">&#39;class&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+        <span class="nx">Symfony\Component\HttpFoundation\File\UploadedFile</span><span class="o">::</span><span class="na">class</span> <span class="o">=&gt;</span> <span class="nx">Plank\Mediable\SourceAdapters\UploadedFileAdapter</span><span class="o">::</span><span class="na">class</span><span class="p">,</span>
+        <span class="nx">Symfony\Component\HttpFoundation\File\File</span><span class="o">::</span><span class="na">class</span> <span class="o">=&gt;</span> <span class="nx">Plank\Mediable\SourceAdapters\FileAdapter</span><span class="o">::</span><span class="na">class</span><span class="p">,</span>
+    <span class="p">],</span>
+    <span class="s1">&#39;pattern&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+        <span class="s1">&#39;^https?://&#39;</span> <span class="o">=&gt;</span> <span class="nx">Plank\Mediable\SourceAdapters\RemoteUrlAdapter</span><span class="o">::</span><span class="na">class</span><span class="p">,</span>
+        <span class="s1">&#39;^/&#39;</span> <span class="o">=&gt;</span> <span class="nx">Plank\Mediable\SourceAdapters\LocalPathAdapter</span><span class="o">::</span><span class="na">class</span>
+    <span class="p">],</span>
+<span class="p">],</span>
+
+<span class="cm">/*</span>
+<span class="cm"> * List of URL Generators to use for handling various filesystem disks</span>
+<span class="cm"> */</span>
+<span class="s1">&#39;url_generators&#39;</span> <span class="o">=&gt;</span> <span class="p">[</span>
+    <span class="s1">&#39;local&#39;</span> <span class="o">=&gt;</span> <span class="nx">Plank\Mediable\UrlGenerators\LocalUrlGenerator</span><span class="o">::</span><span class="na">class</span><span class="p">,</span>
+    <span class="s1">&#39;s3&#39;</span> <span class="o">=&gt;</span> <span class="nx">Plank\Mediable\UrlGenerators\S3UrlGenerator</span><span class="o">::</span><span class="na">class</span><span class="p">,</span>
+<span class="p">],</span>
 </pre></div>
 </div>
 </div>
@@ -338,7 +413,7 @@ <h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'2.0.0',
+            VERSION:'2.2.0',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/build/html/genindex.html b/docs/build/html/genindex.html
index c5184d2..8595801 100644
--- a/docs/build/html/genindex.html
+++ b/docs/build/html/genindex.html
@@ -9,7 +9,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Index &mdash; Laravel-Mediable 2.0.0 documentation</title>
+  <title>Index &mdash; Laravel-Mediable 2.2.0 documentation</title>
   
 
   
@@ -31,7 +31,7 @@
   
 
   
-    <link rel="top" title="Laravel-Mediable 2.0.0 documentation" href="index.html"/> 
+    <link rel="top" title="Laravel-Mediable 2.2.0 documentation" href="index.html"/> 
 
   
   <script src="_static/js/modernizr.min.js"></script>
@@ -59,7 +59,7 @@
             
             
               <div class="version">
-                2.0.0
+                2.2.0
               </div>
             
           
@@ -173,7 +173,7 @@ <h1 id="index">Index</h1>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'2.0.0',
+            VERSION:'2.2.0',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/build/html/index.html b/docs/build/html/index.html
index 1ba8bd7..2622dc0 100644
--- a/docs/build/html/index.html
+++ b/docs/build/html/index.html
@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Plank/Laravel-Mediable &mdash; Laravel-Mediable 2.0.0 documentation</title>
+  <title>Plank/Laravel-Mediable &mdash; Laravel-Mediable 2.2.0 documentation</title>
   
 
   
@@ -30,7 +30,7 @@
   
 
   
-    <link rel="top" title="Laravel-Mediable 2.0.0 documentation" href="#"/>
+    <link rel="top" title="Laravel-Mediable 2.2.0 documentation" href="#"/>
         <link rel="next" title="Installation" href="installation.html"/> 
 
   
@@ -59,7 +59,7 @@
             
             
               <div class="version">
-                2.0.0
+                2.2.0
               </div>
             
           
@@ -243,7 +243,7 @@ <h2>Features<a class="headerlink" href="#features" title="Permalink to this head
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'2.0.0',
+            VERSION:'2.2.0',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/build/html/installation.html b/docs/build/html/installation.html
index 28772fd..503a9c5 100644
--- a/docs/build/html/installation.html
+++ b/docs/build/html/installation.html
@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Installation &mdash; Laravel-Mediable 2.0.0 documentation</title>
+  <title>Installation &mdash; Laravel-Mediable 2.2.0 documentation</title>
   
 
   
@@ -30,7 +30,7 @@
   
 
   
-    <link rel="top" title="Laravel-Mediable 2.0.0 documentation" href="index.html"/>
+    <link rel="top" title="Laravel-Mediable 2.2.0 documentation" href="index.html"/>
         <link rel="next" title="Configuration" href="configuration.html"/>
         <link rel="prev" title="Plank/Laravel-Mediable" href="index.html"/> 
 
@@ -60,7 +60,7 @@
             
             
               <div class="version">
-                2.0.0
+                2.2.0
               </div>
             
           
@@ -210,7 +210,7 @@ <h1>Installation<a class="headerlink" href="#installation" title="Permalink to t
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'2.0.0',
+            VERSION:'2.2.0',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/build/html/media.html b/docs/build/html/media.html
index dfa80f3..ba491a6 100644
--- a/docs/build/html/media.html
+++ b/docs/build/html/media.html
@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Using Media &mdash; Laravel-Mediable 2.0.0 documentation</title>
+  <title>Using Media &mdash; Laravel-Mediable 2.2.0 documentation</title>
   
 
   
@@ -30,7 +30,7 @@
   
 
   
-    <link rel="top" title="Laravel-Mediable 2.0.0 documentation" href="index.html"/>
+    <link rel="top" title="Laravel-Mediable 2.2.0 documentation" href="index.html"/>
         <link rel="next" title="Aggregate Types" href="types.html"/>
         <link rel="prev" title="Handling Media" href="mediable.html"/> 
 
@@ -60,7 +60,7 @@
             
             
               <div class="version">
-                2.0.0
+                2.2.0
               </div>
             
           
@@ -268,7 +268,7 @@ <h3>Soft Deletes<a class="headerlink" href="#soft-deletes" title="Permalink to t
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'2.0.0',
+            VERSION:'2.2.0',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/build/html/mediable.html b/docs/build/html/mediable.html
index 8bd68f4..5d5ce5b 100644
--- a/docs/build/html/mediable.html
+++ b/docs/build/html/mediable.html
@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Handling Media &mdash; Laravel-Mediable 2.0.0 documentation</title>
+  <title>Handling Media &mdash; Laravel-Mediable 2.2.0 documentation</title>
   
 
   
@@ -30,7 +30,7 @@
   
 
   
-    <link rel="top" title="Laravel-Mediable 2.0.0 documentation" href="index.html"/>
+    <link rel="top" title="Laravel-Mediable 2.2.0 documentation" href="index.html"/>
         <link rel="next" title="Using Media" href="media.html"/>
         <link rel="prev" title="Uploading Files" href="uploader.html"/> 
 
@@ -60,7 +60,7 @@
             
             
               <div class="version">
-                2.0.0
+                2.2.0
               </div>
             
           
@@ -213,7 +213,7 @@ <h2>Retrieving Media<a class="headerlink" href="#retrieving-media" title="Permal
 <span class="nv">$media</span> <span class="o">=</span> <span class="nv">$post</span><span class="o">-&gt;</span><span class="na">getMedia</span><span class="p">(</span><span class="s1">&#39;thumbnail&#39;</span><span class="p">);</span>
 </pre></div>
 </div>
-<p>This returns a collection of all media assigned to that tag. In cases where you only need one <cite>Media</cite> entity, you can instead use <cite>firstMedia()</cite>.</p>
+<p>This returns a collection of all media assigned to that tag. In cases where you only need one <code class="docutils literal"><span class="pre">Media</span></code> entity, you can instead use <code class="docutils literal"><span class="pre">firstMedia()</span></code>.</p>
 <div class="highlight-php"><div class="highlight"><pre><span></span><span class="cp">&lt;?php</span>
 <span class="nv">$media</span> <span class="o">=</span> <span class="nv">$post</span><span class="o">-&gt;</span><span class="na">firstMedia</span><span class="p">(</span><span class="s1">&#39;thumbnail&#39;</span><span class="p">);</span>
 <span class="c1">// shorthand for</span>
@@ -437,7 +437,7 @@ <h3>Soft Deletes<a class="headerlink" href="#soft-deletes" title="Permalink to t
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'2.0.0',
+            VERSION:'2.2.0',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/build/html/objects.inv b/docs/build/html/objects.inv
index 9556af9..0f3cca2 100644
--- a/docs/build/html/objects.inv
+++ b/docs/build/html/objects.inv
@@ -1,6 +1,6 @@
 # Sphinx inventory version 2
 # Project: Laravel-Mediable
-# Version: 2.0.0
+# Version: 2.2.0
 # The remainder of this file is compressed using zlib.
 xڅ�Mo!���
 �n�^{3�Njbb۫��,`����.hSo;/�;3���AW�GK�c��(i�@[�6�����n�:9��7���~�����@����6��ڐ�Ό}J*��Ծ���TH�	����>��ѡbB�զWm8)����kj�K�i��J(��:qV�=>§'�~��8d�a�'�k2��|��v�v�}J���m�	-$���'8�l���%z�/*��۔z�Ҩ�.�K~"�mC�C���:W��"��wD�������k���q������/��8��/H�B�܋]��RCS�YKW������q���Y���?g���1RY
\ No newline at end of file
diff --git a/docs/build/html/search.html b/docs/build/html/search.html
index 34dd7ab..145fffc 100644
--- a/docs/build/html/search.html
+++ b/docs/build/html/search.html
@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Search &mdash; Laravel-Mediable 2.0.0 documentation</title>
+  <title>Search &mdash; Laravel-Mediable 2.2.0 documentation</title>
   
 
   
@@ -30,7 +30,7 @@
   
 
   
-    <link rel="top" title="Laravel-Mediable 2.0.0 documentation" href="index.html"/> 
+    <link rel="top" title="Laravel-Mediable 2.2.0 documentation" href="index.html"/> 
 
   
   <script src="_static/js/modernizr.min.js"></script>
@@ -58,7 +58,7 @@
             
             
               <div class="version">
-                2.0.0
+                2.2.0
               </div>
             
           
@@ -176,7 +176,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'2.0.0',
+            VERSION:'2.2.0',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/build/html/searchindex.js b/docs/build/html/searchindex.js
index 52936d5..d10d841 100644
--- a/docs/build/html/searchindex.js
+++ b/docs/build/html/searchindex.js
@@ -1 +1 @@
-Search.setIndex({envversion:49,filenames:["index","mediable"],objects:{},objnames:{},objtypes:{},terms:{"case":1,"class":1,"default":1,"function":[0,1],"import":[0,1],"new":1,"return":1,"true":1,"while":1,abl:1,accept:1,access:[0,1],add:1,after:1,aggreg:0,aggregat:0,alia:1,all:1,allow:[0,1],alreadi:1,also:1,alwai:1,ani:[0,1],anoth:1,any:1,app:1,appli:1,applic:1,approach:[0,1],argument:1,arrai:1,artisan:0,assign:[0,1],associ:1,assume:1,attach:0,attachmedia:1,attempt:1,automat:0,avail:1,avoid:1,basi:1,behaviour:1,between:1,both:1,builder:1,call:1,can:1,care:1,chang:1,check:0,claus:1,code:1,collect:1,command:0,commit:1,condition:1,config:1,configur:0,consid:1,consider:1,content:1,coupl:1,databas:1,deal:1,defin:1,delet:0,describ:1,destin:0,detach:0,detach_on_soft_delet:1,detachmedia:1,detachmediatag:1,differ:0,directli:1,directori:0,dirti:1,disabl:1,disk:0,down:1,download:0,driven:0,duplic:0,each:1,easili:0,echo:1,either:1,eloqu:1,eloquent:1,empti:1,enabl:1,entiti:1,exampl:1,execut:1,exist:1,extend:[0,1],extens:0,fals:1,file:[0,1],filenam:0,filesystem:0,first:1,firstmedia:1,follow:1,footer:1,forcedelet:1,foreach:1,from:1,galleri:[0,1],get:[0,1],getallmediabytag:1,getkei:1,getmedia:1,getmediamatchal:1,gettagsformedia:1,geturl:1,gif:0,given:1,group:1,guid:0,handl:0,hasmedia:1,have:1,header:1,how:1,illumin:1,imag:0,index:1,indiviud:1,input:1,insert:1,installat:0,instanc:1,instead:1,issu:1,item:1,jpeg:0,keep:1,kei:1,least:1,like:1,limit:1,load:0,loadmedia:1,loadmediamatchal:1,mani:[0,1],manipul:1,mark:1,match_al:1,media1:1,media2:1,media:0,method:1,mime:0,model:[0,1],modifi:[0,1],more:1,move:0,multipl:1,namespac:1,need:[0,1],new_media:1,next:1,note:1,number:[0,1],numer:1,oen:1,onli:1,optim:1,order:0,other:[0,1],packag:[0,1],page:1,paramet:1,parent:1,part:1,particular:1,pass:1,path:0,perform:1,php:1,png:0,polymorph:0,post:1,prefer:1,preload:1,prepend:1,presenc:0,previous:1,problem:1,properti:1,protect:1,provid:1,purg:1,purpos:0,queri:[0,1],read:1,record:1,refer:1,rehydr:0,rehydrate_media:1,rehydrates_media:1,relat:1,relationship:[0,1],reload:1,remov:1,render:1,replac:0,restrict:0,retriev:0,run:1,same:1,schema:0,scope:1,second:1,separ:1,set:[0,1],share:1,shorthand:1,should:1,similarli:1,simpli:1,singl:1,slow:1,softdelet:1,sourc:0,specif:[0,1],specifi:[0,1],standard:1,start:0,still:1,string:1,sum:1,syncmedia:1,system:1,tag:[0,1],take:1,taken:1,tell:1,thei:1,thi:1,those:1,thumbnail:[0,1],time:1,track:1,trait:1,type:0,unord:1,update:0,upload:0,url:0,using:0,valid:0,valu:1,verifi:1,wai:1,want:1,when:1,where:1,wherehasmedia:1,which:1,wide:1,withmedia:1,withmediamatchal:1,without:[0,1],would:1,you:1,your:1},titles:["Plank/Laravel-Mediable","Handling Media"],titleterms:{attach:1,automat:1,check:1,delet:1,detach:1,eager:1,featur:0,handl:1,laravel:0,lazi:1,load:1,media:1,mediabl:[0,1],order:1,plank:0,presenc:1,rehydr:1,replac:1,retriev:1,soft:1}})
\ No newline at end of file
+Search.setIndex({envversion:49,filenames:["configuration","index","mediable"],objects:{},objnames:{},objtypes:{},terms:{"byte":0,"case":[0,2],"class":[0,2],"default":[0,2],"import":[1,2],"new":[0,2],"public":0,"return":[0,2],"throw":0,"true":[0,2],"try":0,"while":2,abl:[0,2],about:0,accept:2,access:[0,1,2],adapt:0,adapter:0,add:[0,2],addit:0,after:2,aggreg:[0,1],aggregate_typ:0,alia:2,all:2,allow:[0,1,2],allow_unrecognized_typ:0,allowed_aggregate_typ:0,allowed_disk:0,allowed_extens:0,allowed_mime_typ:0,alreadi:2,also:2,alwai:[0,2],amazonaw:0,ani:[1,2],anoth:2,any:2,app:[0,2],appli:2,applic:[0,2],approach:[1,2],argument:2,arrai:2,artisan:1,asset:0,assign:[1,2],associ:2,assum:0,assume:2,attach:1,attachmedia:2,attempt:2,author:0,automat:1,avail:2,avoid:2,base:0,basi:[0,2],befor:0,behaviour:[0,2],belong:0,below:0,best:0,between:2,both:[0,2],bucket:0,builder:2,built:0,call:2,can:[0,2],care:2,chang:2,check:1,claus:2,cloud:0,code:2,collect:2,com:0,command:1,commit:2,common:0,compon:0,condition:2,config:[0,2],congfig:0,consid:2,consider:2,constantli:0,content:2,could:0,coupl:2,cover:0,creat:0,databas:2,deal:2,default_disk:0,defin:[0,2],definit:0,delet:[0,1],describ:2,destin:1,detach:1,detach_on_soft_delet:2,detachmedia:2,detachmediatag:2,determin:0,differ:[0,1],directli:2,directori:1,dirti:2,disabl:2,document:0,domain:0,done:0,down:2,download:1,driven:1,driver:0,duplic:[0,1],each:[0,2],easi:0,easili:1,echo:2,edit:0,either:[0,2],eloqu:2,eloquent:2,elsewher:0,empti:2,enabl:2,entiti:2,env:0,error:0,exampl:[0,2],except:0,exception:0,execut:2,exist:2,extens:[0,1],fals:[0,2],feel:0,file:[0,1,2],fileadapt:0,filenam:1,filesystem:[0,1],find:0,first:2,firstmedia:2,follow:[0,2],foo:0,footer:2,forcedelet:2,foreach:2,fqcn:0,free:0,from:2,galleri:[1,2],gener:0,get:[1,2],getallmediabytag:2,getkei:2,getmedia:2,getmediamatchal:2,gettagsformedia:2,geturl:[0,2],gif:1,given:[0,2],group:2,guid:1,handl:[0,1],hasmedia:2,have:[0,2],header:2,how:[0,2],htm:0,html:0,http:0,httpfoundat:0,identifi:0,illumin:2,imag:1,includ:0,increment:0,index:2,indiviud:2,inform:0,input:[0,2],insert:2,installat:1,instanc:[0,2],instead:2,instruct:0,intend:0,intern:0,issu:2,item:2,jpeg:1,jpg:0,juggl:0,keep:2,kei:[0,2],kind:0,laravel:[],latest:0,learn:0,least:2,let:0,like:[0,2],limit:2,link:0,list:0,load:1,loadmedia:2,loadmediamatchal:2,local:0,localpathadapt:0,localurlgener:0,locat:0,make:0,mani:[0,1,2],manipul:2,map:0,mark:2,markdown:0,markup:0,match:0,match_al:2,max_siz:0,maximum:0,media1:2,media2:2,media:[0,1],mediabl:[],mediableurlexcept:0,mediaupload:0,method:2,mime:[0,1],mime_typ:0,model:[0,1,2],modifi:[0,1,2],more:[0,2],move:1,multipl:[0,2],name:0,namespac:2,need:[0,1,2],new_media:2,next:2,none:0,note:[0,2],number:[0,1,2],numer:2,oen:2,offer:0,old:0,on_dupl:0,on_duplicate_increment:0,once:0,onli:[0,2],only:0,optim:2,option:0,order:1,other:[0,1,2],overridden:0,own:0,packag:[0,1,2],page:2,paramet:2,parent:2,part:2,particular:2,pass:2,path:1,pattern:0,per:0,perform:2,permiss:0,php:[0,2],place:0,plank:[],plankmediablemediaupload:[],png:1,polymorph:1,post:2,prefer:2,prefix:0,preload:2,prepend:2,presenc:1,present:0,previous:2,privat:0,problem:2,properti:2,protect:2,provid:[0,2],public_path:0,publicli:0,purg:2,purpos:1,queri:[1,2],read:2,recogn:0,record:[0,2],refer:2,regex:0,region:0,rehydr:1,rehydrate_media:2,rehydrates_media:2,reject:0,relat:2,relationship:[1,2],reload:2,remoteurladapt:0,remov:2,render:2,replac:[0,1],requir:0,restrict:1,retriev:1,root:0,run:2,s3_bucket:0,s3_key:0,s3_region:0,s3_secret:0,s3urlgener:0,same:2,schema:1,scope:2,second:2,secret:0,separ:2,serv:0,set:[0,1,2],setup:0,share:[0,2],shorthand:2,should:[0,2],similar:0,similarli:2,simpli:2,singl:[0,2],size:0,slow:2,softdelet:2,some:0,sourc:[0,1],source_adapt:0,sourceadapt:0,specif:[0,1,2],specifi:[0,1,2],standard:2,start:1,still:2,storag:0,storage_path:0,store:0,strict_type_check:0,string:2,suffix:0,sum:2,symbol:0,symfoni:0,symlink:0,syncmedia:2,system:[0,2],tag:[1,2],take:2,taken:2,tell:2,text:0,than:0,thei:2,themselv:0,thi:[0,2],those:2,thrown:0,thumbnail:[1,2],time:2,top:0,track:2,trait:2,under:0,unless:0,unord:2,update:1,upload:[0,1],uploadedfil:0,uploadedfileadapt:0,url:[0,1],url_gener:0,urlgener:0,using:1,valu:[0,2],variou:0,verifi:2,version:0,wai:2,want:[0,2],webroot:0,what:0,when:2,where:[0,2],wherehasmedia:2,which:[0,2],whose:0,wide:2,withmedia:2,withmediamatchal:2,without:[0,1,2],would:[0,2],xhtml:0,xml:0,you:[0,2],your:[0,2]},titles:["Configuration","Plank/Laravel-Mediable","Handling Media"],titleterms:{"function":0,aggregat:0,attach:2,automat:2,check:2,configur:0,delet:2,detach:2,disk:0,eager:2,extend:0,featur:1,handl:2,laravel:1,lazi:2,load:2,media:2,mediabl:[1,2],order:2,plank:1,presenc:2,rehydr:2,replac:2,retriev:2,soft:2,type:0,valid:0,visibl:0}})
\ No newline at end of file
diff --git a/docs/build/html/types.html b/docs/build/html/types.html
index 7e24643..bd2e909 100644
--- a/docs/build/html/types.html
+++ b/docs/build/html/types.html
@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Aggregate Types &mdash; Laravel-Mediable 2.0.0 documentation</title>
+  <title>Aggregate Types &mdash; Laravel-Mediable 2.2.0 documentation</title>
   
 
   
@@ -30,7 +30,7 @@
   
 
   
-    <link rel="top" title="Laravel-Mediable 2.0.0 documentation" href="index.html"/>
+    <link rel="top" title="Laravel-Mediable 2.2.0 documentation" href="index.html"/>
         <link rel="next" title="Artisan Commands" href="commands.html"/>
         <link rel="prev" title="Using Media" href="media.html"/> 
 
@@ -60,7 +60,7 @@
             
             
               <div class="version">
-                2.0.0
+                2.2.0
               </div>
             
           
@@ -196,7 +196,7 @@ <h1>Aggregate Types<a class="headerlink" href="#aggregate-types" title="Permalin
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'2.0.0',
+            VERSION:'2.2.0',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/build/html/uploader.html b/docs/build/html/uploader.html
index c3f7bbd..598c9f6 100644
--- a/docs/build/html/uploader.html
+++ b/docs/build/html/uploader.html
@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Uploading Files &mdash; Laravel-Mediable 2.0.0 documentation</title>
+  <title>Uploading Files &mdash; Laravel-Mediable 2.2.0 documentation</title>
   
 
   
@@ -30,7 +30,7 @@
   
 
   
-    <link rel="top" title="Laravel-Mediable 2.0.0 documentation" href="index.html"/>
+    <link rel="top" title="Laravel-Mediable 2.2.0 documentation" href="index.html"/>
         <link rel="next" title="Handling Media" href="mediable.html"/>
         <link rel="prev" title="Configuration" href="configuration.html"/> 
 
@@ -60,7 +60,7 @@
             
             
               <div class="version">
-                2.0.0
+                2.2.0
               </div>
             
           
@@ -311,7 +311,7 @@ <h2>Updating Files<a class="headerlink" href="#updating-files" title="Permalink
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'2.0.0',
+            VERSION:'2.2.0',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/source/conf.py b/docs/source/conf.py
index b027c9a..472cda4 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -59,9 +59,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2.0.0'
+version = u'2.2.0'
 # The full version, including alpha/beta/rc tags.
-release = u'2.0.0'
+release = u'2.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst
index ab60e27..25fed20 100644
--- a/docs/source/configuration.rst
+++ b/docs/source/configuration.rst
@@ -14,6 +14,7 @@ An example setup with one private disk (``local``) and one publicly accessible d
 
 ::
 
+    <?php
     //...
     'disks' => [
         'local' => [
@@ -33,6 +34,7 @@ Once you have set up as many disks as you need, edit ``config/mediable.php`` to
 
 ::
 
+    <?php
     //...
     /*
      * Filesystem disk to use if none is specified
@@ -47,6 +49,85 @@ Once you have set up as many disks as you need, edit ``config/mediable.php`` to
     ],
     //...
 
+
+Disk Visibility
+^^^^^^^^^^^^^^^
+
+This package is able to generate public URLs for accessing media, and uses the disk config to determine how this should be done.
+
+URLs can always be generated for ``Media`` placed on a disk located below the webroot.
+
+::
+
+    <?php
+    'disks' => [
+        'uploads' => [
+            'driver' => 'local',
+            'root' => public_path('uploads'),
+        ],
+    ]
+
+    //...
+
+    $media->getUrl(); // returns http://domain.com/uploads/foo.jpg
+
+``Media`` placed on a disk located elsewhere will throw an exception.
+
+::
+
+    <?php
+    'disks' => [
+        'private' => [
+            'driver' => 'local',
+            'root' => storage_path('private'),
+        ],
+    ]
+
+    //...
+
+    $media->getUrl(); // Throws a Plank\Mediable\Exceptions\MediableUrlException
+
+If you are using symbolic links to make local disks accessible, you can instruct the package to generate URLs with the ``'visibility' => 'public'`` key. By default, the package will assume that the symlink is named ``'storage'``, as per `laravel's documentation <https://laravel.com/docs/5.3/filesystem#the-public-disk>`_. This can be modified with the ``'prefix'`` key.
+
+::
+
+    <?php
+    'disks' => [
+        'public' => [
+            'driver' => 'local',
+            'root' => storage_path('public'),
+            'visibility' => 'public',
+            'prefix' => 'assets'
+        ],
+    ]
+
+    //...
+
+    $media->getUrl(); // returns http://domain.com/assets/foo.jpg
+
+
+Permissions for S3-based disks is set on the buckets themselves. You can inform the package that ``Media`` on an S3 disk can be linked by URL by adding the ``'visibility' => 'public'`` key to the disk congfig.
+
+::
+
+    <?php
+    'disks' => [
+        'cloud' => [
+            'driver' => 's3',
+            'key'    => env('S3_KEY'),
+            'secret' => env('S3_SECRET'),
+            'region' => env('S3_REGION'),
+            'bucket' => env('S3_BUCKET'),
+            'version' => 'latest',
+            'visibility' => 'public'
+        ],
+    ]
+
+    //...
+
+    $media->getUrl(); // returns https://s3.amazonaws.com/bucket/foo.jpg
+
+
 .. _validation:
 
 Validation
@@ -56,6 +137,7 @@ The `config/mediable.php` offers a number of options for configuring how media u
 
 ::
 
+    <?php
     //...
     /*
      * The maximum file size in bytes for a single uploaded file
@@ -106,10 +188,11 @@ Aggregate Types
 
 Laravel-Mediable provides functionality for handling multiple kinds of files under a shared aggregate type. This is intended to make it easy to find similar media without needing to constantly juggle multiple MIME types or file extensions.
 
-The package defines a number of common file types in the config file (config/mediable.php). Feel free to modify the default types provided by the package or add your own. Each aggregate type requires a key used to identify the type and a list of MIME types and file extensions that should be recognized as belonging to that aggregate type. For example, if you wanted to add an aggregate type for different types of markup, you could do the following.
+The package defines a number of common file types in the config file (``config/mediable.php``). Feel free to modify the default types provided by the package or add your own. Each aggregate type requires a key used to identify the type and a list of MIME types and file extensions that should be recognized as belonging to that aggregate type. For example, if you wanted to add an aggregate type for different types of markup, you could do the following.
 
 ::
 
+    <?php
     //...
     'aggregate_types' => [
         //...
@@ -145,6 +228,7 @@ The ``config/mediable.php`` file lets you specify a number of classes to be use
 
 ::
 
+    <?php
     /*
      * FQCN of the model to use for media
      *
diff --git a/docs/source/mediable.rst b/docs/source/mediable.rst
index 9540d67..ae809a8 100644
--- a/docs/source/mediable.rst
+++ b/docs/source/mediable.rst
@@ -72,7 +72,7 @@ You can retrieve media attached to a file by refering to the tag to which it was
     <?php
     $media = $post->getMedia('thumbnail');
 
-This returns a collection of all media assigned to that tag. In cases where you only need one `Media` entity, you can instead use `firstMedia()`.
+This returns a collection of all media assigned to that tag. In cases where you only need one ``Media`` entity, you can instead use ``firstMedia()``.
 
 ::
 
diff --git a/migrations/2016_06_27_000001_create_mediable_test_tables.php b/migrations/2016_06_27_000001_create_mediable_test_tables.php
index b1a7271..c181c12 100644
--- a/migrations/2016_06_27_000001_create_mediable_test_tables.php
+++ b/migrations/2016_06_27_000001_create_mediable_test_tables.php
@@ -16,13 +16,13 @@ class CreateMediableTestTables extends Migration
      */
     public function up()
     {
-        Schema::create('sample_mediables', function(Blueprint $table){
+        Schema::create('sample_mediables', function (Blueprint $table) {
             $table->increments('id');
             $table->timestamps();
             $table->softDeletes();
         });
 
-        Schema::table('media', function(Blueprint $table){
+        Schema::table('media', function (Blueprint $table) {
             $table->softDeletes();
         });
     }
@@ -34,7 +34,7 @@ public function up()
      */
     public function down()
     {
-        Schema::table('media', function(Blueprint $table){
+        Schema::table('media', function (Blueprint $table) {
             $table->dropColumn('deleted_at');
         });
         Schema::drop('sample_mediables');
diff --git a/src/Media.php b/src/Media.php
index f17e8fb..ee73698 100644
--- a/src/Media.php
+++ b/src/Media.php
@@ -116,7 +116,7 @@ public function scopeWhereBasename(Builder $q, $basename)
     public function scopeForPathOnDisk(Builder $q, $disk, $path)
     {
         $q->where('disk', $disk)
-            ->where('directory', pathinfo($path, PATHINFO_DIRNAME))
+            ->where('directory', File::cleanDirname($path))
             ->where('filename', pathinfo($path, PATHINFO_FILENAME))
             ->where('extension', pathinfo($path, PATHINFO_EXTENSION));
     }
diff --git a/src/MediaUploader.php b/src/MediaUploader.php
index 9cd5967..89290c9 100644
--- a/src/MediaUploader.php
+++ b/src/MediaUploader.php
@@ -609,7 +609,7 @@ private function handleDuplicate(Media $model)
     {
         switch ($this->config['on_duplicate']) {
             case static::ON_DUPLICATE_ERROR:
-                throw MediaUploadException::fileExists($model->getDiskpath);
+                throw MediaUploadException::fileExists($model->getDiskPath());
                 break;
             case static::ON_DUPLICATE_REPLACE:
                 $this->deleteExistingMedia($model);
diff --git a/src/SourceAdapters/SourceAdapterFactory.php b/src/SourceAdapters/SourceAdapterFactory.php
index c8db2af..666b253 100644
--- a/src/SourceAdapters/SourceAdapterFactory.php
+++ b/src/SourceAdapters/SourceAdapterFactory.php
@@ -33,6 +33,8 @@ class SourceAdapterFactory
      */
     public function create($source)
     {
+        $adapter = null;
+
         if ($source instanceof SourceAdapterInterface) {
             return $source;
         } elseif (is_object($source)) {
diff --git a/src/UrlGenerators/BaseUrlGenerator.php b/src/UrlGenerators/BaseUrlGenerator.php
index 2a2bb7c..6555685 100644
--- a/src/UrlGenerators/BaseUrlGenerator.php
+++ b/src/UrlGenerators/BaseUrlGenerator.php
@@ -42,6 +42,14 @@ public function setMedia(Media $media)
         $this->media = $media;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function isPubliclyAccessible()
+    {
+        return $this->getDiskConfig('visibility', 'private') == 'public';
+    }
+
     /**
      * Get a config value for the current disk.
      * @param  string $key
diff --git a/src/UrlGenerators/LocalUrlGenerator.php b/src/UrlGenerators/LocalUrlGenerator.php
index 97253b8..1d36954 100644
--- a/src/UrlGenerators/LocalUrlGenerator.php
+++ b/src/UrlGenerators/LocalUrlGenerator.php
@@ -34,7 +34,7 @@ public function __construct(Config $config, Url $url)
      */
     public function isPubliclyAccessible()
     {
-        return strpos($this->getAbsolutePath(), public_path()) === 0;
+        return  parent::isPubliclyAccessible() || $this->isInWebroot();
     }
 
     /**
@@ -47,7 +47,11 @@ public function getPublicPath()
         if (! $this->isPubliclyAccessible()) {
             throw MediaUrlException::mediaNotPubliclyAccessible($this->getAbsolutePath(), public_path());
         }
-        $path = str_replace(public_path(), '', $this->getAbsolutePath());
+        if ($this->isInWebroot()) {
+            $path = str_replace(public_path(), '', $this->getAbsolutePath());
+        } else {
+            $path = rtrim($this->getDiskConfig('prefix', 'storage'), '/').'/'.$this->media->getDiskPath();
+        }
 
         return $this->cleanDirectorySeparators($path);
     }
@@ -82,4 +86,9 @@ protected function cleanDirectorySeparators($path)
 
         return $path;
     }
+
+    private function isInWebroot()
+    {
+        return strpos($this->getAbsolutePath(), public_path()) === 0;
+    }
 }
diff --git a/src/UrlGenerators/S3UrlGenerator.php b/src/UrlGenerators/S3UrlGenerator.php
index 336ae47..6cb180e 100644
--- a/src/UrlGenerators/S3UrlGenerator.php
+++ b/src/UrlGenerators/S3UrlGenerator.php
@@ -38,16 +38,6 @@ public function getAbsolutePath()
         return $this->getUrl();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isPubliclyAccessible()
-    {
-        //file permissions are set on the buckets themselves
-        //use config value if possible
-        return $this->getDiskConfig('visibility', 'public') == 'public';
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/src/UrlGenerators/UrlGeneratorInterface.php b/src/UrlGenerators/UrlGeneratorInterface.php
index fc8c0f6..d8a2ac1 100644
--- a/src/UrlGenerators/UrlGeneratorInterface.php
+++ b/src/UrlGenerators/UrlGeneratorInterface.php
@@ -28,6 +28,8 @@ public function getAbsolutePath();
 
     /**
      * Check if the file is publicly accessible.
+     *
+     * Disks configs should indicate this with the visibility key
      * @return bool
      */
     public function isPubliclyAccessible();
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 0f149e6..1bd9027 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -54,7 +54,12 @@ protected function getEnvironmentSetUp($app)
             'uploads' => [
                 'driver' => 'local',
                 'root' => public_path('uploads'),
-                'visibility' => 'public'
+            ],
+            'public_storage' => [
+                'driver' => 'local',
+                'root' => storage_path('public'),
+                'visibility' => 'public',
+                'prefix' => 'prefix'
             ],
             's3' => [
                 'driver' => 's3',
@@ -62,7 +67,8 @@ protected function getEnvironmentSetUp($app)
                 'secret' => env('S3_SECRET'),
                 'region' => env('S3_REGION'),
                 'bucket' => env('S3_BUCKET'),
-                'version' => 'latest'
+                'version' => 'latest',
+                'visibility' => 'public'
             ]
         ]);
 
diff --git a/tests/integration/MediaTest.php b/tests/integration/MediaTest.php
index 69b97af..f517131 100644
--- a/tests/integration/MediaTest.php
+++ b/tests/integration/MediaTest.php
@@ -82,6 +82,18 @@ public function test_it_can_be_queried_by_path_on_disk()
         $this->assertEquals(4, Media::forPathOnDisk('tmp', 'foo/bar/baz/bat.jpg')->first()->id);
     }
 
+    public function test_it_can_be_queried_by_path_on_disk_when_directory_is_empty()
+    {
+        factory(Media::class)->create([
+            'id' => 4,
+            'disk' => 'tmp',
+            'directory' => '',
+            'filename' => 'bat',
+            'extension' => 'jpg'
+        ]);
+        $this->assertEquals(4, Media::forPathOnDisk('tmp', 'bat.jpg')->first()->id);
+    }
+
     public function test_it_can_view_human_readable_file_size()
     {
         $media = factory(Media::class)->make(['size' => 0]);
diff --git a/tests/integration/UrlGenerators/LocalUrlGeneratorTest.php b/tests/integration/UrlGenerators/LocalUrlGeneratorTest.php
index c2d40ab..98f0a9b 100644
--- a/tests/integration/UrlGenerators/LocalUrlGeneratorTest.php
+++ b/tests/integration/UrlGenerators/LocalUrlGeneratorTest.php
@@ -27,6 +27,12 @@ public function test_it_throws_exception_for_non_public_disk()
         $generator->getPublicPath();
     }
 
+    public function test_it_accepts_public_visiblity()
+    {
+        $generator = $this->setupGenerator('public_storage');
+        $this->assertEquals('http://localhost/prefix/foo/bar.jpg', $generator->getUrl());
+    }
+
     protected function setupGenerator($disk = 'uploads')
     {
         $media = factory(Media::class)->make([
diff --git a/tests/integration/UrlGenerators/UrlGeneratorFactoryTest.php b/tests/integration/UrlGenerators/UrlGeneratorFactoryTest.php
index d232fc9..67769fd 100644
--- a/tests/integration/UrlGenerators/UrlGeneratorFactoryTest.php
+++ b/tests/integration/UrlGenerators/UrlGeneratorFactoryTest.php
@@ -7,7 +7,6 @@
 
 class UrlGeneratorFactoryTest extends TestCase
 {
-
     public function test_it_sets_generator_for_driver()
     {
         $factory = new UrlGeneratorFactory;