Merge remote rotdrop frok

see #189