Further implementations on issue #51.