Brought .Net verstion up-to-date and added discovery.