A proper default-handler.
Merge pull request #2 from imalberto/fix-handler

A proper default-handler.