Merge pull request #603 from pshevtsov/crosshair