Added onDisable() method