Merge remote rotdrop branch

see #189