Reorder `make_batch` parameters
Merge pull request #335 from lucidd/#303

Reorder `make_batch` parameters