Merge branch 'master' into 'master'

fix #56



See merge request !15
2 jobs for master in 4 minutes