Merge pull request #197 from ecsv/batman-adv-speedyjoin