Merge pull request #1124 from UCIS/patch-5