Merge pull request #1 from melrief/master

port to cdh4.4.0