Merge pull request #1 from apache/master

Merging Hama latest code into my cloned repo