Fix issue #8
Merge pull request #13 from jDramaix/jd_fix_issue_8

Fix issue #8