Merge request

Support for mapReduce