work3_2
Merge branch 'issue-1111'
Merge branch 'master' of github.com:MedibaWorkshop/workshop_B