[WIP][issue #206]