Crosshair support
Merge pull request #336 from geoadmin/dev_crosshair

Crosshair support