Merge pull request #602 from DG-i/master