Merge pull request #1354 from Bubu83/patch-1