Merge pull request #7 from zpiman/master

Add future times
Merge pull request #1 from netcode/master

Merge pull request #7 from zpiman/master