Merge pull request #939 from dibdot/master