Use map-stream
Merge pull request #2 from KenanY/map-stream

Use map-stream