Add map() and flatmap()

As discussed in #11.
Yeah it threw me a bit! Thanks for the clarification :)