map function changed to produce callables in a lazy way
Merge remote-tracking branch 'origin/master'