Fix onStreamClose not firing 'close' correctly. Also fix cleanup.
Version bump to 0.2.1