pull-request-138

@shinnlok Do we really need to create new instances of the handlers every time?