Added guard
Fixed #1
Merge pull request #6 from redde/1-fix_camelcase

Fix Category_value to CategoryValue