Updated NETS info, oops
Merge branch 'dev'