Merge pull request #14 from hterkelsen/no_directory

Don't use Uri.directory