Adding multi directory and file support. closes #1
Merge branch 'issue-1'