Multiple authors

Fixes #117 
Branches off #158