Merge branch 'master' into 'master'

fix #57



See merge request !14
2 jobs for master in 4 minutes and 5 seconds (queued for 1 second)