Merge pull request #39 from kelvinlee93/master

1
Fix categories
Fix categories 2
Merge pull request #6 from mrcupid12/master

Fix