Added --no-subdirectories option