merged #36