Merge pull request #1 from alffrey/master

Category Handler class and Package dependency
Merge pull request #2 from OctoFalcon/master

Merge pull request #1 from alffrey/master