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

Use map-stream