Merge pull request #36 from amithkanand/stable_hive

Fixed hive issues to make it stable