Fixed a bug with the unique validator
Merge remote-tracking branch 'origin/master'