Fixed #971
Fixed #969
Merge pull request #985 from dvvrd/robots

Fixed #969, #971