[WIP][issue #89] code finished