Here is a fix for issue #59 posted by romainneutron