erickt Merge pull request #177 from erickt/futures …