Merge pull request #11 from aju/master

Use map-stream to transform streams - code refactor
Clean-up a little bit