Netplay testing work
Merge pull request #264 from HoltMaki/master

Netplay testing work