mattfidler Merge pull request #4 from tarsius/patch-1