ADD: Fix wrong class names
ADD: Change vcard id generator method to public
Merge pull request #1 from Globemaster/master

ADD: Fix wrong class names — thanks for the fixes!