Fix issue #84
Merge pull request #85 from Jogo27/bugfix/84

Fix issue #84
Merge branch 'master' into batch