Added default category handling.
Resolves #21.