minor fix
Merge branch 'master' into dev
fix typo
GFS fixes
fix Hadoop definitions
fixes