Merge branch 'fixes_issues_31' into 'master'

Fixes issues 31

See merge request !24
3 jobs for master in 2 minutes and 50 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #90766
build

00:01:32

passed #90767
release

00:01:35

 
  Test
passed #90768
unitTests

00:01:14