invitations (partly)
Merge pull request #15 from dvicini/master

invitations (partly)