Additionnal Fixes #225
Merge pull request #13 from mtoma/fix-issue-225-bis

Additionnal Fixes #225