merging changes for FusionDirectory 1.0.7.2