afeld Merge pull request #33 from 18F/tears