Fix #84
Merge pull request #73 from jvoisin/fix_84

Fix #84