Code from Expiry Map team
Merge pull request #1 from tomviner/master

Code from the Expiry Map Group