Fixing potential problems with radius estimation
Updated top-level cmake file