Fixes #35
Merge pull request #36 from sleeper/filter_files_in_expand

Fixes #35