Sasha Hilton 90ae9d713d Fix conflicts from PR #143 7 lat temu
..
lib.rs d900134114 connect: discovery and spirc 7 lat temu
main.rs 90ae9d713d Fix conflicts from PR #143 7 lat temu