Allow specifying a default handler
Merge pull request #590 from joefiorini/default-handler

Allow specifying a default handler