Merge pull request #595 from UCIS/master