Updates from master
Merge pull request #3 from airbnb/alexindigo-master-merge

Updates from master