merge with intelhadoop/gearpump