Applied diff from #44

Conflicts:
	src/io/socket/IOConnection.java