[WIP] Fix for issue #113
WIP because waiting for accepting this merge request: !223 (closed)
Merge request contains:
- Fix for issue #113 (closed)
- Small refactor (duplicated code was extracted to separate methods)
WIP because waiting for accepting this merge request: !223 (closed)
Merge request contains: