Merge pull request #572 from ndawe/master

batch: use single process if gridmode is True