[WIP][issue #369] implementation finished