issue #165 - Edit routing
issue #165 - Fix acceptInvitation method