Merge branch 'master' into 'master'

fix #60



See merge request !18
2 jobs for master in 9 minutes and 31 seconds