Fixed bugs with batch handling
Merge pull request #11 from yvondamours/master

Fixed bugs with batch handling