Simplify expandDirectories
option handling
#218
Merged
expandDirectories
option handling
#218