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

Additionnal Fixes for #225