Merge branch 'issue466' into 'master'

it fixes #466. Tests are not included yet

Closes #466

See merge request !473
3 jobs for master in 10 minutes and 3 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #161154
Lint

00:01:55

passed #161155
Test

00:04:12

 
  Build
passed #161156
Build

00:05:50