initial
Merge branch 'master' of https://github.com/andrehacker/mapred

No idea about the reason for this commit