amends from fc
Merge pull request #1346 from lutgendorff/patch-35

amends from fc