bug#1956
Merge pull request #88 from ladislav/f

bug#1956