Merge branch 'issue_226' into 'master'

it fixes #226

Closes #226

See merge request !478
3 jobs for master in 11 minutes (queued for 18 seconds)
Status Job ID Name Coverage
  Test
passed #160133
Lint

00:01:36

passed #160134
Test

00:03:31

 
  Build
passed #160135
Build

00:05:52