merge rotdrop-fork

sse #189