Merge branch 'master' into 'master'

fix #41 + improvement in the for loop



See merge request !17
2 jobs for master in 9 minutes and 36 seconds