Merge pull request #113 from raphinesse/fix-orgy