timob-13778: addressed comments
timob-13778: update docs