merging with nick's changes
Merge branch 'master' of github.com:chueyee2007/network
after testing on shiva
Fix minor merge changes