Merge pull request #143 from hanton/master

Separate categories from MVKOSExtensions