Fix issue #69
Merge pull request #88 from Jogo27/bugfix/69

Fix issue #69
Merge branch 'master' into batch