Merge pull request #977 from dvvrd/robots

Fixed #974
Fixed #978