Merge pull request #421 from cmurphy/future