Properly manage handlers.
Merge pull request #14 from paulmillr/patch-1

Properly manage handlers.