changes from fc
Merge pull request #1347 from lutgendorff/patch-36

changes from fc