Improve resource cleanup in close:
0.0.4