Master player spiderfy

Rebase of #401