pr #21 @dandv