fixes
merge attempt
Merge pull request #3 from lyft/merge_attempt

fixes