Merge pull request #992 from dibdot/master