merge segor's fork