Fork of ReturnInfinity/BMFS for contributing changes