Merge pull request #1351 from Bubu83/patch-2