Makes uniqueness an explicit, documented concern
Merge pull request #1185 from systay/uniqueness

Makes uniqueness an explicit, documented concern