Allow vrid to be overridden
Add commenting
Merge pull request #36 from andymcc/grizzly

Merged automatically by jenkins after successful build test