Merge branch 'fix/speedup' into 'master'

Fix and speedup

See merge request !33
1 job for master in 55 seconds (queued for 9 seconds)