Fixed validation
Merge branch 'master' of https://github.com/CodingBliss/WhiteElephant