Add support for issue #82

Add variable substitution on Hive queries to assist with issue #82