Merge pull request #998 from dvvrd/robots

Fixed horribly slow work of 2D model