Merge branch 'fix_bugs' into 'master'

Fix bugs

See merge request !135
1 job for master in 4 minutes and 55 seconds (queued for 5 seconds)