Merge pull request #207 from pedroigor/master

[PLINK-308] - Support mapping between types and their corresponding objectClasses.
Merge remote-tracking branch 'upstream/master'