Allow ability to override vrid
Adjust comments
Merge pull request #34 from andymcc/grizzly

Merged automatically by jenkins after successful build test