Instance/class discrimination

https://github.com/kfgodel/diamond/issues/188
Merge pull request #197 from kfgodel/188-class_instance_discriminator

Instance/class discrimination