Restoring to master branch to allow directory lists