Upgrade to CM 1.2.87
Make class types unique
Merge pull request #119 from njam/issue-119

Upgrade to CM 1.2.87