added 'upcoming' function
Merge pull request #4 from stockholmux/master

Merging.