Added uniqueness check.
Merge branch 'fixuniqueness' into develop