Adding DistanceUnit support, closes #27