Merging branch in preparation for closing it
Closing the nettool branch