Feature disk fun

Added suport for Funs on Disks