pierreozoux Merge pull request #27 from scoid/patch-2 …