merge implements Issue16(#17)