Latest updates, still not working properly though...
Latest updates.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Non-Thread-version/src/old/Proxy.java