Support for multiple files/directories

This is PR for #8