Validation refactoring
Merge branch 'master' of https://github.com/6ruce/events