Initial categories implementation
Fixed categories support
Finalized category implementation
Merge branch 'master' into testing