Fix
Merge pull request #30 from ardumont/master

Fix