Merge pull request #40 from stevage/vet-pool-4128