Merge pull request #82 from abartov/master

Fix: categorymembers to match new continue rules
Implemented imageusage and globalusage, per issue #83