a bit tuning
Merge branch 'master' of https://github.com/chrisbloecker/Hive