Added support for mountpoints with underscores in the path (e.g. /mnt/backup_drive)