Upgrade validator
Merge pull request #974 from stenington/upgrade-validator

Upgrade validator