Allow mixture of files and urls
Merge pull request #67 from theodi/feature-allow-mixture-of-files-and-urls

Allow mixture of files and urls