Add a method to get the Validator instance
Improve comments
Merge branch 'refs/heads/master' into develop
Update comment and remove whitespace