Merge pull request #43 from dpradeep/VAT-645