Merge pull request #5 from iirelu/category-fix