merged #38