from collaborator
Merge pull request #1 from ulfahlpb/collaborator

from collaborator