Issues #44, #48, #49