Merge branch 'release/0.2.0' into develop
Created private interfaces for the categories (to get rid of the warnings)
Merge branch 'release/0.2.0'