now works with OF master!