manually merge #47