Added dispose logic
0.0.1