Robustness for late join
Merge pull request #55 from tribal-tec/master

Robustness for late join