Merge pull request #786 from ecsv/batman-parallel