Merge pull request #1355 from Bubu83/patch-2