Merge pull request #98 from adufray/patch-1