Merge pull request #58 from rfw/patch-1