Merge "This should handle multiple directories"