bug fix - added the add_handler and remove_handler method + some optimizations . thanks @meepen