Implementation of Issues #83, #85, #88