Fix Batch issues. Fixes issue #41.
4 files changed