Manually merged #30.