changes from fc
Merge pull request #1352 from lutgendorff/patch-41

changes from fc