fixed multiple bugs
Merge branch 'master' of https://github.com/YananJian/MapReduce