Fix hadoop errors
Merge branch 'master' of https://github.com/nuchs/Where4ArtThou