Merge pull request #279 from harveyfeng/branch-0.9

get rid of hcatalog dependency