Update
Merge pull request #43 from sanemat/feature/use-the-future

Update