bz 877311
Merge pull request #99 from VaclavDedik/master-wfk22

bz 877311