Some modifications
Modifications
Added onDestroy method