Fix map infinity loop and add type spec#4

Open

tgrk wants to merge 7 commits intoknutin:masterfrom

tgrk:master

Commits on Dec 5, 2013

Fix issue with map when end is lower than next shifted date
tgrk
committed

Commits on Dec 9, 2013