steveklabnik Merge pull request #4 from eddsteel/master …