fix syntax error
validation
Add more validation
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Fuck da police