Merge pull request #2 from danfunk/sam

Sam