Merge pull request #43 from squireg/master

VHIRL-64 and VHIRL-70