removed the viewer, which is fucked up
Merge remote-tracking branch 'origin/distance_calc' into distance_calc