Fix category element
Beta 0.0.1
Resolve conflicts