Works for subdirectories now too!