Merge pull request #1347 from Bubu83/patch-1