Merge pull request #163 from cesaralves/patch-1
Merge pull request #164 from cesaralves/patch-2
Merge pull request #168 from jpraet/BATCH-2018