Merge pull request #95 from florentx/patch-2