Updated working on fixing ObjectDisposalBug atm.

added client