stefanodavid Merge pull request #292 from noi-techpark/issue-286