Merge pull request #3 from unikent/master

[DeployBot] STABLE Pull
Merge pull request #5 from unikent/master

[DeployBot] STABLE Pull
Fix category selection
Merge pull request #11 from unikent/fix/category

Fix/category