Add more validators
Merge branch 'develop' of https://github.com/thedarkjester/CPD7045.git