Added support for subcategories (see #19)