Moved changes in the modules/net module from the master branch. Fixed a number of errors in the assembly and a number of compilation warnings.