Fixes after Validation
Merge pull request #1 from chris-hammersley/master

Fixes after Validation