merge with  erlware / resource_discovery