changes from fc
Merge pull request #1350 from lutgendorff/patch-39

changes from fc