Merge pull request #1332 from Bubu83/patch-1