merged #26