Merge pull request #1353 from Bubu83/patch-2