Merge pull request #904 from kossebau/patch-1