Merge pull request #1333 from Bubu83/patch-2