Merge pull request #4 from yahone/master

Bug fixes for categories in question
Ampersant