Merge pull request #1188 from dibdot/master